gentoo resync : 09.03.2018

34 files changed, 27 insertions, 1582 deletions

diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 5203a7a7064e..d2af632ea22c 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/abcl/Manifest b/dev-lisp/abcl/Manifest
index 157721146940..cb429cf07093 100644
--- a/dev-lisp/abcl/Manifest
+++ b/dev-lisp/abcl/Manifest
@@ -1,6 +1,6 @@
 DIST abcl-0.0.9.tar.gz 592410 BLAKE2B 7c8a2f4b03d251785f49b62965eb1e0906871080c29ff1bf41db3e2c45ded42adf4a131a833b347f3d3eac17b228b0e575985ec7f2cd02e4691085f645b05b11 SHA512 d822f099ab73f1f62f14bfa3991b88573587d90a8c31e97933549bd19fabaa4d9337963ba33f6ef59f65c259f374bbabb5263c2c3fda3d99a19a645756f80a1c
 DIST abcl-src-0.20.0.tar.gz 735614 BLAKE2B a4052bdbdd7de00d4232b63df29b281b48825d219cca8754f7ffff8c8e42cb22ee321f449ef0d72b6dc62d6e857e406d5d56236f61066adf5026975cfd31e4d9 SHA512 73b033883149b1083a03d87ed5c41b5b6e790cb02978a82f1b57274e6744b66c7b05c5a708077f354ee46ce0780327dfc728bbd9cd9c4f87bd69b730ead8e81b
 EBUILD abcl-0.0.9-r1.ebuild 2004 BLAKE2B 622307f7abf84a0a8edd35dbc4ff60aa174b358b19cab6aa5632814886ca45b7500b2de486e1ca3d8cc278f71c5525c83c3e044509cac45bd6d257624baecd9c SHA512 07d39aaa6f35ebcfa454b8a28527bd79a10693fb111afb45683f7ae04b5e8b38d4ab65426b45df3c99fe194f53c528d40a547a91fe689b96d24701e8ecc1527d
-EBUILD abcl-0.20.0-r1.ebuild 1059 BLAKE2B 274ed5969b2419bb907bbb428113cf50d7dc60c8e1f3284735373d617a7bd64c545649bef3da2fceaa9371c45be16555a45f7348ae1657473a5fed9d5f56efea SHA512 c336fb09ad29372dcb344e1c784c3e2b03122f541f38418b3100a5a9f6b34df97c45be230aad81772b4c692447c4148adebbb5ba775af54c83143aba93b44d0c
+EBUILD abcl-0.20.0-r1.ebuild 1058 BLAKE2B a68c43363c108615807f4c04732efc551987b9a3725c0efcfa878680d3f2f5d046a4c086d88aaaeda7c0e1ddf1dddfe1071582f1d0a0be4be1e1dbdd6ef9028c SHA512 138a8b20be9486a32c0b511765dda76bb496eecb9e67fd82e2eed24b4aad4fb690b65575242ffd4871928c2b9de50dc7fc0f5fdb61afd9eedc0e9d2a0b4ad3a7
 EBUILD abcl-0.20.0.ebuild 841 BLAKE2B 0fba72965705bba04e28d2e4674fd1e2dc644a097de9d7feb26210b1fb8d823ae8b2b5e01f1ecc7e253940c748f813ba3d43bf6a2367f90c6ccc1821d57ea3d3 SHA512 4d9ec141c654c4bc08fb40028dd1bf3b95eb77a8bbf879a32b47ae7fda9e2b8825f16355c268321280c2fd07d16cdd4f4142b0db85e8fd84dc1769805ecd7870
 MISC metadata.xml 756 BLAKE2B 89eebda38b1d87b775be700f8b6308d7184bcd1d5cfbcb8aed108eabeb4999b97561ac70fbfb30fa7eab72696eddca4fc532bb81d78b7b9e87cfe40ad17eb49c SHA512 5b04db4f6e680850b17493db2973bff0b260194fc7f4e9252c4250b58bfe7eea1398df2fe703a49106e5c7c8b5c1bb31bd8b18296767b164566b02f6673ab860
diff --git a/dev-lisp/abcl/abcl-0.20.0-r1.ebuild b/dev-lisp/abcl/abcl-0.20.0-r1.ebuild
index b8b725f655fd..a181bebc531c 100644
--- a/dev-lisp/abcl/abcl-0.20.0-r1.ebuild
+++ b/dev-lisp/abcl/abcl-0.20.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://common-lisp.net/project/armedbear/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest
index 3753a180291c..af9556e17000 100644
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@@ -1,24 +1,9 @@
 AUX gentoo-init.lisp 354 BLAKE2B 201ba124983acd9f86a35742079fa9d9af3c7c5b29c2c2f3021e07907dbd808a59bc82931558aea8bfb6821f600d0b2944eb5a3b518474e203323f7210c4685c SHA512 28a24bdc25b7f2304b1c837eb1ca44d5006de6bae1d8e5cfd2bc4bac800dfad9c9c7b3964fd0667c89da95051a42da9054bda3f94202867dbae7b02dfd2b03e4
 AUX source-registry.conf 138 BLAKE2B 1adc9396d0d23b361c52d70b1c10d7f5e031776b1a5bb168fe55a2fb90e03a6771511cfe52a26256620988f030cdc51d75e0ac3f433eb8a500aa5d8c119e0427 SHA512 244ce3e7cd9c5f483f99c8e43f2d62d16ea35b25897029b7b9038fe5412752f7d8c7ea11396fd87c218e77c63c5efe2f27c2a11fe49ffb79908f8e7b85bf64c9
-DIST asdf-3.0.3.tar.gz 427575 BLAKE2B e237a60982beff858a6aaf90736a54be0f7fec7d4d26c8bb370cab50e743df291e88372579318501cd199734119cfbdea6cde51ac3b5ca5af9e22e8b2b032052 SHA512 d9d8d466c7b6aa6beb1c22da4fd10499fa784c39ab138bea7ecb8cdccf769766572ebe91c89db2d5c53e493096248f82a224be95c1fcac8b7beebe1b57f34883
 DIST asdf-3.1.5.tar.gz 400359 BLAKE2B 586a66799a37259694baa673f2849e183fac5fedfe5ff5c92529d47fc0954d40b48bbc095db926b9ea2214b551729c269d0925e4396a52310b72fd5f21842f49 SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516
-DIST asdf-3.1.6.tar.gz 396066 BLAKE2B 4cf18e83eb62448f4eb29a38a44d9cd5a0d5393ecaba4d1eacdc2a41e02989bea632a7ae4f583a4b6a7fcd6f24351a1d65179a6c06f2c22ed9d1bc8cc24c9b0b SHA512 3203bef1ce4c2d28306ca1ee214d3d5fd04b3d2caa61f606d0334f100358bfbd9b03d69c95e83734175639a91e76aeac509e949768fc694817631078671a9bc1
-DIST asdf-3.1.7.tgz 402257 BLAKE2B f6bafb3843fef8ca566c89aa64f8987656fcf7cb262cdb97d3f797e296e32c9d9fe7115b4019bf93eea4b891b36d3d81a589be6e5506035c004a0552d81756d7 SHA512 ebe2ddf702f6200bf98408fb262e9929565c9d29bcd874dd2657a6f84e123b0153a78e457fb425d48a05c427f7c090ab5fd0e6201223eb4b296b3b4cd5b57c26
-DIST asdf-3.2.0.tar.gz 438536 BLAKE2B aed96ab33e33a1aa996dd0be6cc0d230cde0d11510332677837230dde3480f3c85ef1f09085f3d85197b0c441b0fd29269522539a5475b5a994e091e3af8046e SHA512 2c273aa7b1049c1a8f4da5d195ac7c2cceba238228508847b5afbed8a258ad49e6b346e79b07d0347be0326d3558ed881838fe8461a6d45cc3f2d58380789fcb
-DIST asdf-3.2.1.tar.gz 460536 BLAKE2B 080398a9a2bdd48b2ce08dad939b997dea8e7f23ee0012fbfccbe7ae0f72d24b832730e5c6bf5383a6e4753cd1226f08c5450a6636266b70e7590c9970cbc751 SHA512 686881536126eb6ffb7e9db763aec02e1ad7ab4df60cc96d094bc4cebb95453e3d57273cb925471c7ee13e4378ca3c0d697c416b7374ad07148e11d89aee85b0
 DIST asdf-3.3.0.tar.gz 498451 BLAKE2B dea8e659eab482604067f5989c766b52b9bc4f0bafeb7a12508520abf686dde730225dbc3063291dd334b1a97a41d04b4207be4680ae0cae9a4207222eda7b43 SHA512 4e8b3434d9eb504af253fa39ac759cceb7ea0c3e2c364875d7259b32a9818b051fb2a3c94c188c7f38e43825e2a18107f1732211534a8b1fbbaa77b6c7f90486
 DIST asdf-3.3.1.tar.gz 479255 BLAKE2B 5161b79741a52721eaa4da80a61bbe51e924967ecb744a087fdcbd99407abcc42faf39eafe6d30af7dd8af751a80caaf23e93ce42aa5f584123a1e8b528cc613 SHA512 bf5efec4518eb5312ce743c0fbe60c587bebfe26c36c833c163d67bf8631e18eeb293f2185e547f6be10da061a17f024d9f4a3a0808727d7b9b3a7d7a0faf133
-DIST cl-asdf_1.89-1.diff.gz 395 BLAKE2B bded3192ece58409af6fd8d05d0da347c32e3c2ffaf155b93f93b0d5bb89cbf0c14ec06df48a9c53badbe808cc322d47859e3d4b46be73868625b39315fd01de SHA512 0d5ac51e69914b58497815971f1736712bd65988944fff5966f854c2dd22d1969d9237c996bfd44a6195d2765db9af07c3055c9bf126ba25059eccdbf8da20b4
-DIST cl-asdf_1.89.orig.tar.gz 60134 BLAKE2B b0115406f09fcae108c2fa5e68d88f4936cd9b7a86d7cad34a007c6d2adc2164f23de4f55e0844ce3d217e7439b291856c43f038e520da5d27a8c0574d417398 SHA512 eb20877bb6acb6cab5874229290605aaef19d2501d8011473b66d0c9609d0b4d12f2951c39e4a3d2d07a3f0a7862c7e6beb6073514bb8b36189049bb96ba0e9a
-EBUILD asdf-1.89.ebuild 954 BLAKE2B 2138db8e7d522975180a3cc97bcae727b0a79060205fdef912ba8c24a04787a706a211db6c854666a9cccf1145a0f5b44e5aef28a64173fe9e8ab6db5f9a4e30 SHA512 35cf4118af9e0fe878702bffe87e1cf49abde2e2dac0797a75f70e52c65dc5aafc3c5424acee282b5fedfdbaeede956cfdcd5bb6843fc6c3463350df897ca250
-EBUILD asdf-3.0.3.ebuild 1116 BLAKE2B 63db117917d40f9d0a3900e3e7715b2c006778d735fb38a407e5e6225709bfff60081a1b583543692735aabbddc3deebbd6b9fba4507ceade3b8edf5e929f287 SHA512 4eb651965855678df5d210bbce8022677de9cfb134ce3e616da11fa7edcb48dbb17987bca4f870e003e85f956cceab6820aa85c36d6692ec1015d13b46fa7201
-EBUILD asdf-3.1.5.ebuild 1187 BLAKE2B 8fafa2469bde7fb4fb910ec3d807dc70e7166074a05ce255d10b038aa3001b58dcca2202cb5193db2c1e841563a742bbc7a5926a041eb7c37f933732780fa387 SHA512 b0e94bf6d1f4d31cd3d63b2b92cd185a8fe0d386d10aaf935d4eeca2a421eaf074d51efe9bef7620e10768171de3e3a2d7a7003a1261aa7cc918670afdc8ac94
-EBUILD asdf-3.1.6.ebuild 1180 BLAKE2B 3ff4aae2215682fa2c524a9d5bd1b8e633a6d7ea61b8195df248d7bf3f3524ea6f8e89989454411d74575d4ae98c9d9090a3f811cf46f15f5da1334c2c9ee85b SHA512 429009487f7b97cdd7dd9c9868bfb4a200aa0d7a3e21d5f40d574c6f6c03efb27e7da3033d5a9e1198bb3fb0484dfe91e9c01d5cf91bfc0b002319bd9d5bc0c0
-EBUILD asdf-3.1.7.ebuild 1176 BLAKE2B 85d3a71de1244d5f7cd6875ab0c6d1f6d5b6adf34822e657b6055ea67ee9f25cdfcf9790884bc5511fb49828bf15d7daa524a5fdb82fb09e54ae93636bb8ce21 SHA512 ffa2180e39645c19559b2e1bd116a858e8b052ce2f162edd02f7a5f62db92f3ef1d222126569ac10294f9a29aa1711225d4f217e8529748895ba2f1aabf6de7e
-EBUILD asdf-3.2.0-r1.ebuild 1217 BLAKE2B 93791bc22a25a93a80ceb719fcdddd8fc7f6acaf2ecffdbe9602308d619e6c3569fb14b53521f938827c2603e41d38d535c40bee239cfb1ed035e3d68c846e60 SHA512 324b8406d9955edda267ab00f34d6e97fd490d48184d8c8bc925b63f73737d207b85a7b29770eb02388bdb07a9ef8d77fb7633b8cccc48dea43bcf1b4067725b
-EBUILD asdf-3.2.0.ebuild 1180 BLAKE2B 83449cbd835e3cdb9501e7a5911d677ee96ddee8ad286f33fdff64909400dd20bc2c738c1a9a7adb99684328e5799ba2d6221b00846f59d5c0753cbbb36256de SHA512 7b8ba0ddf907f715c34f296f88fe0332cbe69b051304b5a61647411c7c3ca9d0fb8267d18d8301472a4152e10d3e65281cd616f92746dbd888ed379cd0dc1cb8
-EBUILD asdf-3.2.1-r1.ebuild 1565 BLAKE2B 72f039c6a684070bb23953dfd8dc76754e3c3d86f72cb4ffbc0297fd5934851871c16d0a3acac988b3b5f4292416a7c3b52276b4b38fbc94322af42395c97f89 SHA512 3832123b0ae4f5e99aa8603aa3165a61537ebd807ab9755dd7136d1adbe1fe593bfe2988f4e26814171909dd16923b77e1f445a42b5e2739e15cec0869076617
-EBUILD asdf-3.2.1.ebuild 1217 BLAKE2B 93791bc22a25a93a80ceb719fcdddd8fc7f6acaf2ecffdbe9602308d619e6c3569fb14b53521f938827c2603e41d38d535c40bee239cfb1ed035e3d68c846e60 SHA512 324b8406d9955edda267ab00f34d6e97fd490d48184d8c8bc925b63f73737d207b85a7b29770eb02388bdb07a9ef8d77fb7633b8cccc48dea43bcf1b4067725b
-EBUILD asdf-3.3.0.ebuild 1366 BLAKE2B 6a86cb11c8216e655d900be441594735099ae6c8b5761b33ac959dfcd4459f718e9e3a48e21b129b26248d7d87bff04fc6aa8e31db457b999eabf938d6952d6f SHA512 9be27455ed41c2e74a3f9100cdd70ef65789305182e948e4a7a618a7df55347c208a7f3532688ddeadb4a204fbddcc92ce7ffe8488a554024b7cfafbbda29b56
-EBUILD asdf-3.3.1.ebuild 1366 BLAKE2B 6a86cb11c8216e655d900be441594735099ae6c8b5761b33ac959dfcd4459f718e9e3a48e21b129b26248d7d87bff04fc6aa8e31db457b999eabf938d6952d6f SHA512 9be27455ed41c2e74a3f9100cdd70ef65789305182e948e4a7a618a7df55347c208a7f3532688ddeadb4a204fbddcc92ce7ffe8488a554024b7cfafbbda29b56
+EBUILD asdf-3.1.5.ebuild 1136 BLAKE2B 983ecadd2a3d49d523d20ccc91a311fd634663c54e240802e88280711b1e83bc40cf2d5a8a5ee9db6ca339d23e78abe64be23a3f53ee44000f30ee843184f5b0 SHA512 40f2823eb5bb0d54907b10f5cd9b3b9a73afea614ff49f9f1ea1c3bb3c350f092bbbffe85e051c2e21bf4c4ee2186889c2e3876a12a9d47cc5d44190ee12ba47
+EBUILD asdf-3.3.0.ebuild 1308 BLAKE2B 54b301b57efd26260595832c141837aa3dce1a6b7fd6a0f40338b756801401e161694f1194be0f94f79ff2bc7f3b449df6e159a84fbf6e4d8e1bf2f7b1689f6c SHA512 1455ea2aac7af52856c84f19646a782ef469e68999746ad0b83d207aaa33b97c2d21be67e28939ce9a87da7d7a8b72da5db3aacf4a856b00f6dafa4467a3646c
+EBUILD asdf-3.3.1.ebuild 1308 BLAKE2B 54b301b57efd26260595832c141837aa3dce1a6b7fd6a0f40338b756801401e161694f1194be0f94f79ff2bc7f3b449df6e159a84fbf6e4d8e1bf2f7b1689f6c SHA512 1455ea2aac7af52856c84f19646a782ef469e68999746ad0b83d207aaa33b97c2d21be67e28939ce9a87da7d7a8b72da5db3aacf4a856b00f6dafa4467a3646c
 MISC metadata.xml 261 BLAKE2B 161dea7ab371cbcbc08b8aac63e402f9fe994c08d55f2291360e900bf73e21f2c2ea67b6fcc3cb000f1cef03d1c41c6d2e5e16dd06d6916ec90d4e54a1ba3dd7 SHA512 fb754c4ed3579db5dbe303197a05647b7cfab0a3fe47fd2140d5f77641be752d10ccf49a9c267406a0f3ba3dcda8831f778b9596d723f65aff10142bfad60d3d
diff --git a/dev-lisp/asdf/asdf-1.89.ebuild b/dev-lisp/asdf/asdf-1.89.ebuild
deleted file mode 100644
index 63159cfeec99..000000000000
--- a/dev-lisp/asdf/asdf-1.89.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-DEB_PV="1"
-MY_PN="cl-${PN}"
-MY_P="${MY_PN}-${PV}"
-
-inherit eutils
-
-DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://packages.debian.org/unstable/devel/cl-asdf"
-SRC_URI="mirror://gentoo/${MY_PN}_${PV}.orig.tar.gz
-	mirror://gentoo/${MY_PN}_${PV}-${DEB_PV}.diff.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-EPATCH_SOURCE="${WORKDIR}"
-S="${WORKDIR}"/${MY_P}.orig
-
-src_prepare() {
-	epatch ${MY_PN}_${PV}-${DEB_PV}.diff || die
-}
-
-src_install() {
-	insinto /usr/share/common-lisp/source/asdf
-	doins asdf.lisp wild-modules.lisp asdf-install.lisp
-	dodoc README
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*
-	fi
-}
diff --git a/dev-lisp/asdf/asdf-3.0.3.ebuild b/dev-lisp/asdf/asdf-3.0.3.ebuild
deleted file mode 100644
index 09f459a15ec2..000000000000
--- a/dev-lisp/asdf/asdf-3.0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils prefix
-
-DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="doc test"
-
-SLOT="0/${PVR}"
-
-DEPEND="!dev-lisp/cl-${PN}
-		!dev-lisp/asdf-binary-locations
-		!dev-lisp/gentoo-init
-		!<dev-lisp/asdf-2.33-r3
-		doc? ( virtual/texi2dvi )
-		test? ( dev-lisp/sbcl )"
-RDEPEND=""
-PDEPEND="~dev-lisp/uiop-${PV}"
-
-S="${WORKDIR}"
-
-src_compile() {
-	make
-	use doc && make doc
-}
-
-src_install() {
-	insinto /usr/share/common-lisp/source/${PN}
-	doins -r build version.lisp-expr
-	dodoc README TODO
-	dohtml doc/*.{html,css,ico,png}
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/${PN}.pdf
-	fi
-
-	insinto /etc/common-lisp
-	cd "${T}"
-	cp "${FILESDIR}"/gentoo-init.lisp "${FILESDIR}"/source-registry.conf .
-	eprefixify gentoo-init.lisp source-registry.conf
-	doins gentoo-init.lisp source-registry.conf
-}
diff --git a/dev-lisp/asdf/asdf-3.1.5.ebuild b/dev-lisp/asdf/asdf-3.1.5.ebuild
index fb0374622df4..8a067789c189 100644
--- a/dev-lisp/asdf/asdf-3.1.5.ebuild
+++ b/dev-lisp/asdf/asdf-3.1.5.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+
 inherit eutils prefix
 
 DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
@@ -10,14 +11,12 @@ SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc 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"
 
 SLOT="0/${PVR}"
 
 DEPEND="!dev-lisp/cl-${PN}
-		!dev-lisp/asdf-binary-locations
-		!dev-lisp/gentoo-init
 		!<dev-lisp/asdf-2.33-r3
 		doc? ( virtual/texi2dvi )"
 RDEPEND=""
diff --git a/dev-lisp/asdf/asdf-3.1.6.ebuild b/dev-lisp/asdf/asdf-3.1.6.ebuild
deleted file mode 100644
index 26c3321cf7d7..000000000000
--- a/dev-lisp/asdf/asdf-3.1.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils prefix
-
-DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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-binary-locations
-		!dev-lisp/gentoo-init
-		!<dev-lisp/asdf-2.33-r3
-		doc? ( virtual/texi2dvi )"
-RDEPEND=""
-PDEPEND="~dev-lisp/uiop-${PV}"
-
-#S="${WORKDIR}"
-
-src_compile() {
-	make
-	use doc && make doc
-}
-
-src_install() {
-	insinto /usr/share/common-lisp/source/${PN}
-	doins -r build version.lisp-expr
-	dodoc README.md TODO
-	dohtml doc/*.{html,css,ico,png}
-	if use doc; then
-		dohtml -r doc/index.html
-		insinto /usr/share/doc/${PF}
-		#doins doc/${PN}.pdf
-	fi
-
-	insinto /etc/common-lisp
-	cd "${T}"
-	cp "${FILESDIR}"/gentoo-init.lisp "${FILESDIR}"/source-registry.conf .
-	eprefixify gentoo-init.lisp source-registry.conf
-	doins gentoo-init.lisp source-registry.conf
-}
diff --git a/dev-lisp/asdf/asdf-3.1.7.ebuild b/dev-lisp/asdf/asdf-3.1.7.ebuild
deleted file mode 100644
index 315ee1a70f0a..000000000000
--- a/dev-lisp/asdf/asdf-3.1.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils prefix
-
-DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-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-binary-locations
-		!dev-lisp/gentoo-init
-		!<dev-lisp/asdf-2.33-r3
-		doc? ( virtual/texi2dvi )"
-RDEPEND=""
-PDEPEND="~dev-lisp/uiop-${PV}"
-
-S="${WORKDIR}"
-
-src_compile() {
-	make
-	use doc && make doc
-}
-
-src_install() {
-	insinto /usr/share/common-lisp/source/${PN}
-	doins -r build version.lisp-expr
-	dodoc README.md TODO
-	dohtml doc/*.{html,css,ico,png}
-	if use doc; then
-		dohtml -r doc/index.html
-		insinto /usr/share/doc/${PF}
-		#doins doc/${PN}.pdf
-	fi
-
-	insinto /etc/common-lisp
-	cd "${T}"
-	cp "${FILESDIR}"/gentoo-init.lisp "${FILESDIR}"/source-registry.conf .
-	eprefixify gentoo-init.lisp source-registry.conf
-	doins gentoo-init.lisp source-registry.conf
-}
diff --git a/dev-lisp/asdf/asdf-3.2.0-r1.ebuild b/dev-lisp/asdf/asdf-3.2.0-r1.ebuild
deleted file mode 100644
index dd43202a8395..000000000000
--- a/dev-lisp/asdf/asdf-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils prefix
-
-DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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-binary-locations
-		!dev-lisp/gentoo-init
-		!<dev-lisp/asdf-2.33-r3
-		doc? ( virtual/texi2dvi )"
-RDEPEND=""
-PDEPEND="~dev-lisp/uiop-${PV}"
-
-install_docs() {
-	# Not installing info file at the moment, see bug #605752
-	(cd doc ; dodoc *.{html,css,ico,png} "${PN}.pdf" ; dodoc -r asdf)
-}
-
-src_compile() {
-	make
-	use doc && make -C doc
-}
-
-src_install() {
-	insinto "/usr/share/common-lisp/source/${PN}"
-	doins -r build version.lisp-expr
-	dodoc README.md TODO
-	use doc && install_docs
-	insinto /etc/common-lisp
-	cd "${T}" || die
-	cp "${FILESDIR}/gentoo-init.lisp" "${FILESDIR}/source-registry.conf" . || die
-	eprefixify gentoo-init.lisp source-registry.conf
-	doins gentoo-init.lisp source-registry.conf
-}
diff --git a/dev-lisp/asdf/asdf-3.2.0.ebuild b/dev-lisp/asdf/asdf-3.2.0.ebuild
deleted file mode 100644
index 4de3958b980a..000000000000
--- a/dev-lisp/asdf/asdf-3.2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils prefix
-
-DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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-binary-locations
-		!dev-lisp/gentoo-init
-		!<dev-lisp/asdf-2.33-r3
-		doc? ( virtual/texi2dvi )"
-RDEPEND=""
-PDEPEND="~dev-lisp/uiop-${PV}"
-
-install_docs() {
-	(cd doc ; dodoc *.{html,css,ico,png} "${PN}.pdf" ; dodoc -r asdf ; doinfo "${PN}.info")
-}
-
-src_compile() {
-	make
-	use doc && make -C doc
-}
-
-src_install() {
-	insinto "/usr/share/common-lisp/source/${PN}"
-	doins -r build version.lisp-expr
-	dodoc README.md TODO
-	use doc && install_docs
-	insinto /etc/common-lisp
-	cd "${T}" || die
-	cp "${FILESDIR}/gentoo-init.lisp" "${FILESDIR}/source-registry.conf" . || die
-	eprefixify gentoo-init.lisp source-registry.conf
-	doins gentoo-init.lisp source-registry.conf
-}
diff --git a/dev-lisp/asdf/asdf-3.2.1-r1.ebuild b/dev-lisp/asdf/asdf-3.2.1-r1.ebuild
deleted file mode 100644
index 248ed0f7689e..000000000000
--- a/dev-lisp/asdf/asdf-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils prefix common-lisp-3
-
-DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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-binary-locations
-		!dev-lisp/gentoo-init
-		!<dev-lisp/asdf-2.33-r3
-		doc? ( virtual/texi2dvi )"
-RDEPEND=""
-PDEPEND="~dev-lisp/uiop-${PV}"
-
-COMMONLISPS="sbcl clisp clozurecl cmucl ecls"
-
-find-lisp-impl() {
-	for lisp in ${COMMONLISPS} ; do
-		[[ "$(best_version dev-lisp/${lisp})" ]] && echo "${lisp}" && return
-	done
-	die "No CommonLisp implementation found"
-}
-
-install_docs() {
-	(cd doc ; dodoc *.{html,css,ico,png} "${PN}.pdf" ; dodoc -r asdf )
-	if has_version ">=dev-lisp/sbcl-1.4.0" ; then
-		(cd doc ; doinfo "${PN}.info" )
-	fi
-}
-
-src_compile() {
-	emake
-	use doc && emake -C doc
-}
-
-src_test() {
-	common-lisp-export-impl-args "$(find-lisp-impl)"
-	test/run-tests.sh ${CL_BINARY}
-}
-
-src_install() {
-	insinto "${CLSOURCEROOT}/${PN}"
-	doins -r build version.lisp-expr
-	dodoc README.md TODO
-	use doc && install_docs
-	insinto /etc/common-lisp
-	cd "${T}" || die
-	cp "${FILESDIR}/gentoo-init.lisp" "${FILESDIR}/source-registry.conf" . || die
-	eprefixify gentoo-init.lisp source-registry.conf
-	doins gentoo-init.lisp source-registry.conf
-}
diff --git a/dev-lisp/asdf/asdf-3.2.1.ebuild b/dev-lisp/asdf/asdf-3.2.1.ebuild
deleted file mode 100644
index dd43202a8395..000000000000
--- a/dev-lisp/asdf/asdf-3.2.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils prefix
-
-DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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-binary-locations
-		!dev-lisp/gentoo-init
-		!<dev-lisp/asdf-2.33-r3
-		doc? ( virtual/texi2dvi )"
-RDEPEND=""
-PDEPEND="~dev-lisp/uiop-${PV}"
-
-install_docs() {
-	# Not installing info file at the moment, see bug #605752
-	(cd doc ; dodoc *.{html,css,ico,png} "${PN}.pdf" ; dodoc -r asdf)
-}
-
-src_compile() {
-	make
-	use doc && make -C doc
-}
-
-src_install() {
-	insinto "/usr/share/common-lisp/source/${PN}"
-	doins -r build version.lisp-expr
-	dodoc README.md TODO
-	use doc && install_docs
-	insinto /etc/common-lisp
-	cd "${T}" || die
-	cp "${FILESDIR}/gentoo-init.lisp" "${FILESDIR}/source-registry.conf" . || die
-	eprefixify gentoo-init.lisp source-registry.conf
-	doins gentoo-init.lisp source-registry.conf
-}
diff --git a/dev-lisp/asdf/asdf-3.3.0.ebuild b/dev-lisp/asdf/asdf-3.3.0.ebuild
index ecced8bc873a..41961826139a 100644
--- a/dev-lisp/asdf/asdf-3.3.0.ebuild
+++ b/dev-lisp/asdf/asdf-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,6 @@ IUSE="doc"
 SLOT="0/${PVR}"
 
 DEPEND="!dev-lisp/cl-${PN}
-		!dev-lisp/asdf-binary-locations
-		!dev-lisp/gentoo-init
 		!<dev-lisp/asdf-2.33-r3
 		doc? ( virtual/texi2dvi )"
 PDEPEND="virtual/commonlisp
diff --git a/dev-lisp/asdf/asdf-3.3.1.ebuild b/dev-lisp/asdf/asdf-3.3.1.ebuild
index ecced8bc873a..41961826139a 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,6 @@ IUSE="doc"
 SLOT="0/${PVR}"
 
 DEPEND="!dev-lisp/cl-${PN}
-		!dev-lisp/asdf-binary-locations
-		!dev-lisp/gentoo-init
 		!<dev-lisp/asdf-2.33-r3
 		doc? ( virtual/texi2dvi )"
 PDEPEND="virtual/commonlisp
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index c9939473f168..f1dbdcd3b5cb 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,20 +1,11 @@
-AUX clisp-2.48-bits_ipctypes_to_sys_ipc.patch 784 BLAKE2B 1fb1951450ae4b6b6d7ca7a30d7a9ad13397e87d75723fa43df0861cc190049abaf54d821b3822be9b0428e5d0b571f0c13c42518da856cc425b8c166a1870d7 SHA512 7b48abf1a7c8a0bff7946f310c4a1f8ca5add5a6aef5b69379cb52b17b5ad279fa264a50b1017453a902dc3e7e1e4db09730cef1cb1abc20bf0694d674da33b0
 AUX clisp-2.49-bits_ipctypes_to_sys_ipc.patch 784 BLAKE2B 5d8934fa9d430b193321fbfc8dd9250cae072d58f63c29945fd05d3a4f10579785e5d25b9a9239695d2f0fa25b57ad21dcba912644dd61f63f92caa2e72e87b1 SHA512 163d9e29135268272ae3316709c60a25408158dda6649b79bedd07bd0f2e216d8eef113418230e983ad1115ecd1870f9e6c52ce94f02c09eff484f709ed3cd3f
 AUX clisp-2.49-get_hostname.patch 2356 BLAKE2B fc1e5e8c2e3b9f1db8c144390564801af508845e0029f130bebb8f377c540f662fe046e92821c6bb3c77ccfd31c5ed73e4ed10386619f1a1ebe0a6a9d39a215f SHA512 5e9dfc70f017fef08c24ede15c2312a2a54a5c8433a5a952ad4e41113ee0ce01febc631818c4cb506883d9992ef4468c429752e4924b8d1ce00f21b33a209a9b
-AUX clisp-2.49-readline-7.patch 690 BLAKE2B 7502d529c342228b722f568cc808099d9259f7cb59e28cff75a8f9c665f659bf75ea318afb7285a9ee3c1637219affaaffc3bb7001436a44d40605afe2a9432c SHA512 c5c1dd093d19d2d62db29808d418d8fce6233ad226a6b7414223e0cf8e9777231cdd69f4625ac1535a9bbc831b5a3e4fd4baad91a880f3992cd6d98220f887c4
 AUX clisp-2.49-tinfo.patch 404 BLAKE2B 12d9c2a7b6f83b4c0de6f8ab4e57fc2db2f3bfffbb535c0d5793052268a6d12ca21126a8b71895353b37c0a05e268f3eee192d827e63eb71ceb01c3c03cfe176 SHA512 10f27e205557cb48fe0165bd5ee7e3a33b0dbe403fa2d10df62854c44eb762a44ef005c78e8c23a67f7ed6d3c6317c893c7760f9c2ca72b6b088adae5f03247c
-AUX clisp-2.49.60-after_glibc_cfree_bdb.patch 8937 BLAKE2B 93e6413fc788272a53e35835fb72e897303a59f3f6fcb5fecc0b4dc6b68b3941d8745f2df091bec59e988d449c6a4ffc60216f45edb067f505164b9f51779315 SHA512 447ece26b0af6ecadaf5d46930b5b3955bd764953a073d7bf732da313a7b6298ff10334ab1120200468ff806cb90520e3707062b0503f633016f17cc8ea53fc7
 AUX clisp-2.49.90-after_glibc_cfree_bdb.patch 8499 BLAKE2B d093b76cdf25b0822aaca87bd6055c6b58edc68e387d78d7fd979171d881fe585b674246b3a2a6f37a8412b5aef1b997210b4019a1595a07b64471cb9324656f SHA512 1b8cb29bf9caa30ca05474a67202f72f013e57d6b0d2dff1fb5ab0472df9f5c5a5b5de46922c931fa9a4d4a0a25890a05e1f7d38ddfb56c967026eef80001919
 DIST clisp-2.48.tar.bz2 7885098 BLAKE2B 42ebfe4721015f522184bce710bf95d79aa7f2a239410af249a8e85d80f140344ec80daaa34f7cdbfd2ae86407984657163ce3f6e4201eb132f7c71e21523cba SHA512 3288b6a2973c924006b14bbed1e8e3e688276a187ac2a6c7851dc7ae699e7832d30e5e7eecdabc76c08c7e8e8ce1b562eb97a44570d3035e558ea2310de2b719
-DIST clisp-2.49.60.tar.bz2 8745713 BLAKE2B 5dffd594c6d00c2057a98e3f93c888cd5cdc60009cd8fc987e39ff5182e71e575e148839d9c973fbfd0842b82ddf1b5918e86d128d9c79f6d0d4b6afcdc5853f SHA512 656cd59a23ba9be5304a6e0d64d79ac518072c431820b8cf95759fa8f3a66e2efe4d07939315b93e5e06b6e5348d8b32739b129a9e8ac0dc362dd5d1f1eb8aa8
 DIST clisp-2.49.90.tar.bz2 8921458 BLAKE2B 3be7cfe41038f42d8844d500877fa5c20e5c21dc0e162aa0018b297e4dfcd5374ef608793c9d809852e1f9885a155bb5b25fef8efe66016dd0ee400007386b70 SHA512 1fa7205e38883dcc863160b5418ddaaa2c45ee2d2f936de4067d1ea4a1e5043bf1235361bbbfc366afd6d8f1144497ccdccf1767ecf327f7a672b18742ceb651
 DIST clisp-2.49.tar.bz2 8091011 BLAKE2B e034c581b8100837b34d0adf1ef45bd667272d062945875175958178b4ef5b11e899dfb76505eb8cb51fca6101c11a9f21fb2cc9a78a3c0f82b06166211434f7 SHA512 eef66fc85199a2c283b616db61bf67ff103eeb0f19fa907da48994dc790b6f5f8d0c74fb3bd723c6b827c0ff3cfd89fa6ba67934fc669ed5d5249044b5140d81
-EBUILD clisp-2.48-r1.ebuild 4797 BLAKE2B 51c1550e35af93c381ce01eeaf51d6a2027b0b39fa4c880616db4a88d78f06acb8018850d583f13ec705e4a304f48ba09801a736f16a8625275734ab1d0f82d4 SHA512 130ffc47b63c934aa8556ea3e5d5eb8a81300d98bbbff503bdb84a1c7ad1dcbf97b092124bd841bd9b2009df5588aa78c2bda7cea34a461526199957cf44862d
-EBUILD clisp-2.48-r2.ebuild 4726 BLAKE2B f1110afde6cf8d5c5a2509f24705d9ddb5fc4b7c2e151ec52c002986a0b60673ea11e3643db8a383483c45eaa6c7655b07a03743712329b00201503069c57167 SHA512 afce7666a82e947f48e2eeed5ceba5f4cbe981e8f37d6e35beab4dc973a6077b8eecfebb2d1336f2476b6cfc252f5aaef552354d8dfc153920ac2d3291f76de3
-EBUILD clisp-2.49-r100.ebuild 4495 BLAKE2B 6317db64ecc5ac8bb1700d40a7c0394dcbc21779d7901d88225b77f09278b989b4047e418680a2070a063bfadf2451948f714c5caa809342a1931a715608c5e6 SHA512 c022a0b1c704d9d252fdbc741ef6fe6a44ae26b1047c7e8d334aeb171f4bfa836b043432294d508725d429a43bfbca3c413be35b6a38fd02ab8be79506c43dd0
-EBUILD clisp-2.49-r101.ebuild 4565 BLAKE2B ec0ba0122c1638fce794a2579528534743a70468cbee9d39db8b9500f4d9ad68fc5df3c43086083a2b66c58f8adec51afd03ae5df782b9e19bf4a0f684455bc9 SHA512 3d8ee8697b8faed8df82f151cc947bc0e3b689e4710f418b9ee31b1803d59928d0ca4a087f48f77240b06c24527a003a9d9141489ff37fcb778f3c024343e480
-EBUILD clisp-2.49-r8.ebuild 4394 BLAKE2B e49e12b943c60d9b5c3f1272829430ecaed2ed1ce23ae87883ab5056a210fcaa73f6e1adbf8b5a7159261d1fbe9908166f2e9d08fbc6074782cd09a8220e348f SHA512 7548cca817b47bfb9b09812c9564e86f2b5092d1263919d563172555d1371c86bdd0aa7f2f4b3315237a154b911f8c025f62917f434973a608f86728873e97f5
+EBUILD clisp-2.48-r1.ebuild 4916 BLAKE2B 17c575e6854796a4d2eb1be64c553f81bc24779621aef08ed4bd13d4725e362cdd3e1d4de85a77995d695dcbc37cd61ffffed020248aac7dc6e68687d0ed8f2c SHA512 e956690df96aca0ceea14a2498fd21a374833a0dcbd8fb6ae47613e692f4abd9b94cbcd03d4525f024bc403495fb8db347e5a5c85b9e650a56b0ba70c3a53982
 EBUILD clisp-2.49-r9.ebuild 4464 BLAKE2B d9e5644fdcdcf0c12fc0702f2c1bcd458b8781b8e1885cd0a6b28447ca7f77e9346bfc696d06dfaa5be73a2f6b4db1a4511457f5d2a780dae1976e0290fcf34f SHA512 ba4afa4101c4581ae1a866f70d8f3ed903e81f95c03c26b492296dd4cd6b997d04d8f7235c1272dece85f52e2fdda427f2df65eae67cf2c65f9171b1476af0a5
-EBUILD clisp-2.49.60.ebuild 4360 BLAKE2B e26404fbf0cc0f6c3200e8c73c8ea880b8abf7e301a151453d3abb96f54a786858042213d51fea0c7de9dbf3081233cef40b8f51bc2cb5bfa386f541e9e0ec05 SHA512 2d5f81a1a3d6b7b2b23ca01648e50d3dd661cc02105b959d31c484eca26e2a5b6814fa038d2db43a234687856a7630f674401f21716ae180d95a6d8c6b217ba6
-EBUILD clisp-2.49.90.ebuild 4203 BLAKE2B 4a352d04bf95974c6e05f14aeca8cee4f2b048ff97570a21ab762483ef4040670ac4cf6cb3abb34fb8bc650b703d0044c757edebc429e2e1261ea650e18c6033 SHA512 19c71afc4935a54f64e3ac2e6b93843f87b3d09c892ab2742bd956d9fabe50cd49558112d371daadc896521cb1d37f9a39a66db63e80b6db1886d8bb250950c5
-MISC metadata.xml 1450 BLAKE2B a2d3c5142143c8ab054826effb6a0ccfce158bf636406703b1c45c5e63ae70ea0151b1982d376fc03131d8e821a85f499f98f7643b3bfc3884916c38da58227f SHA512 08cd4868b9d6f2600b13add32c2fffda8d59be7190779ef4d3bfc64ab10f13c2644b925cef0ca8f3aa06cd5c8473ef399dfaa3c3ac2cae88d627a6ad83e54128
+EBUILD clisp-2.49.90.ebuild 4268 BLAKE2B 4e823048f77e4e394c980dd6c87af8cc7d0c7df4e1d2e8fb8c1f832bf221b30c8fcdfac75f7283c506ffb85f82f6cbff87bbaf26c33fe57b9413b927031ca53f SHA512 3028d3d786f840d26a34aeb13d2f0163b0ed10fe0cb65413e36f6a896bafd96edb8efba6d8aa939402e9f1a98ab357093e2a5f62a56ad1e0057016ab788a2598
+MISC metadata.xml 1451 BLAKE2B 6310ef5f37288b2b3a156c9d4557c3925a6e1f7ea3622c801f4acc5832159dd32db7d7f174752b69f0b1d0eee2825b0e8e86616fa34074fc3aabdf7fc4275559 SHA512 b475d35af6509939c05d9200fa61616e38817e0c49622b82cff322f09780755c2361fcbba2e839f627e77cad558ecae2cf7f02f8010d595e74b451e5307f38aa
diff --git a/dev-lisp/clisp/clisp-2.48-r1.ebuild b/dev-lisp/clisp/clisp-2.48-r1.ebuild
index a91495a40b8e..a928da766933 100644
--- a/dev-lisp/clisp/clisp-2.48-r1.ebuild
+++ b/dev-lisp/clisp/clisp-2.48-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -34,7 +34,10 @@ RDEPEND="virtual/libiconv
 DEPEND="${RDEPEND}
 	X? ( new-clx? ( x11-misc/imake x11-proto/xextproto ) )"
 
-PDEPEND="dev-lisp/gentoo-init"
+# dev-lisp/gentoo-init is obsolete, it will be dropped soon
+# This version of clisp is its last consumer
+# Bug 648448
+#PDEPEND="dev-lisp/gentoo-init"
 
 enable_modules() {
 	[[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
diff --git a/dev-lisp/clisp/clisp-2.48-r2.ebuild b/dev-lisp/clisp/clisp-2.48-r2.ebuild
deleted file mode 100644
index 95be00d3779b..000000000000
--- a/dev-lisp/clisp/clisp-2.48-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
-HOMEPAGE="http://clisp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc -sparc x86"
-IUSE="berkdb hyperspec X new-clx dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
-
-RDEPEND="virtual/libiconv
-		 >=dev-libs/libsigsegv-2.4
-		 >=dev-libs/ffcall-1.10
-		 dbus? ( sys-apps/dbus )
-		 fastcgi? ( dev-libs/fcgi )
-		 gdbm? ( sys-libs/gdbm )
-		 gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6:2.0 )
-		 pari? ( >=sci-mathematics/pari-2.3.0 )
-		 postgres? ( >=dev-db/postgresql-8.0 )
-		 readline? ( >=sys-libs/readline-5.0 )
-		 pcre? ( dev-libs/libpcre )
-		 svm? ( sci-libs/libsvm )
-		 zlib? ( sys-libs/zlib )
-		 X? ( new-clx? ( x11-libs/libXpm ) )
-		 hyperspec? ( dev-lisp/hyperspec )
-		 berkdb? ( sys-libs/db:4.7 )"
-
-DEPEND="${RDEPEND}
-	X? ( new-clx? ( x11-misc/imake x11-proto/xextproto ) )"
-
-PDEPEND="dev-lisp/gentoo-init"
-
-enable_modules() {
-	[[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
-	for m in "$@" ; do
-		einfo "enabling module $m"
-		myconf+=" --with-module=${m}"
-	done
-}
-
-BUILDDIR="builddir"
-
-# modules not enabled:
-#  * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
-#  * matlab, netica: not in portage
-#  * oracle: can't install oracle-instantclient
-
-src_prepare() {
-	# More than -O1 breaks alpha/ia64
-	if use alpha || use ia64; then
-		sed -i -e 's/-O2//g' src/makemake.in || die
-	fi
-	epatch "${FILESDIR}/${P}-bits_ipctypes_to_sys_ipc.patch"
-}
-
-src_configure() {
-	# We need this to build on alpha/ia64
-	if use alpha || use ia64; then
-		replace-flags -O? -O1
-		append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
-	fi
-
-	# QA issue with lisp.run
-	append-flags -Wa,--noexecstack
-
-	# built-in features
-	local myconf="--with-ffcall --without-dynamic-modules"
-#    There's a problem with jit_allocai function
-#    if use jit; then
-#        myconf+=" --with-jitc=lightning"
-#    fi
-	if use threads; then
-		myconf+=" --with-threads=POSIX_THREADS"
-	fi
-
-	# default modules
-	enable_modules wildcard rawsock
-	# optional modules
-	use elibc_glibc && enable_modules bindings/glibc
-	if use X; then
-		if use new-clx; then
-			enable_modules clx/new-clx
-		else
-			enable_modules clx/mit-clx
-		fi
-	fi
-	if use postgres; then
-		enable_modules postgresql
-		append-flags -I$(pg_config --includedir)
-	fi
-	if use berkdb; then
-		enable_modules berkeley-db
-		append-flags -I/usr/include/db4.7
-	fi
-	use dbus && enable_modules dbus
-	use fastcgi && enable_modules fastcgi
-	use gdbm && enable_modules gdbm
-	use gtk && enable_modules gtk2
-	use pari && enable_modules pari
-	use pcre && enable_modules pcre
-	use svm && enable_modules libsvm
-	use zlib && enable_modules zlib
-
-	if use hyperspec; then
-		CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
-	else
-		CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
-	fi
-
-	# configure chokes on --sysconfdir option
-	local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \
-		$(use_with readline) $(use_with unicode) \
-		${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
-	einfo "${configure}"
-	${configure} || die "./configure failed"
-
-	sed -i 's,"vi","nano",g' "${BUILDDIR}"/config.lisp || die
-
-	IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
-	sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
-		"${BUILDDIR}"/config.lisp || die
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}"/fonts
-	cd "${BUILDDIR}"
-	# parallel build fails
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	pushd "${BUILDDIR}"
-	make DESTDIR="${D}" prefix=/usr install-bin || die
-	doman clisp.1 || die
-	dodoc SUMMARY README* NEWS MAGIC.add ANNOUNCE || die
-	fperms a+x /usr/$(get_libdir)/clisp-${PV/_*/}/clisp-link || die
-	# stripping them removes common symbols (defined but uninitialised variables)
-	# which are then needed to build modules...
-	export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
-	popd
-	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png || die
-	dodoc doc/{CLOS-guide,LISP-tutorial}.txt || die
-}
-
-pkg_postinst() {
-	if use threads || use jit; then
-		while read line; do elog ${line}; done <<EOF
-
-Upstream considers threads to be of Alpha quality, therefore
-it is likely that you will encounter bugs in using them. If you do,
-please report bugs upstream:
-
-Mailing list: https://lists.sourceforge.net/lists/listinfo/clisp-devel
-Bug tracker:  https://sourceforge.net/tracker/?atid=101355&group_id=1355
-
-EOF
-	fi
-}
diff --git a/dev-lisp/clisp/clisp-2.49-r100.ebuild b/dev-lisp/clisp/clisp-2.49-r100.ebuild
deleted file mode 100644
index 8210edc75f43..000000000000
--- a/dev-lisp/clisp/clisp-2.49-r100.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
-HOMEPAGE="http://clisp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2/7"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
-# "jit" disabled ATM
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3
-		 virtual/libiconv
-		 >=dev-libs/libsigsegv-2.4
-		 >=dev-libs/ffcall-1.10
-		 dbus? ( sys-apps/dbus )
-		 fastcgi? ( dev-libs/fcgi )
-		 gdbm? ( sys-libs/gdbm )
-		 gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 )
-		 pari? ( <sci-mathematics/pari-2.5.0 )
-		 postgres? ( >=dev-db/postgresql-8.0:* )
-		 readline? ( >=sys-libs/readline-7.0:0= )
-		 pcre? ( dev-libs/libpcre:3 )
-		 svm? ( sci-libs/libsvm )
-		 zlib? ( sys-libs/zlib )
-		 X? ( x11-libs/libXpm )
-		 hyperspec? ( dev-lisp/hyperspec )
-		 berkdb? ( sys-libs/db:4.8 )"
-#		 jit? ( >=dev-libs/lightning-1.2 )
-
-DEPEND="${RDEPEND}
-	X? ( x11-misc/imake x11-proto/xextproto )"
-
-enable_modules() {
-	[[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
-	for m in "$@" ; do
-		einfo "enabling module $m"
-		myconf+=" --with-module=${m}"
-	done
-}
-
-BUILDDIR="builddir"
-
-# modules not enabled:
-#  * berkdb: must figure out a way to make the configure script pick up the
-#            currect version of the library and headers
-#  * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
-#  * matlab, netica: not in portage
-#  * oracle: can't install oracle-instantclient
-
-src_prepare() {
-	# More than -O1 breaks alpha/ia64
-	if use alpha || use ia64; then
-		sed -i -e 's/-O2//g' src/makemake.in || die
-	fi
-	epatch "${FILESDIR}"/${P}-bits_ipctypes_to_sys_ipc.patch
-	epatch "${FILESDIR}"/${P}-get_hostname.patch
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-	# bug #594552
-	epatch "${FILESDIR}"/${P}-readline-7.patch
-}
-
-src_configure() {
-	# We need this to build on alpha/ia64
-	if use alpha || use ia64; then
-		replace-flags -O? -O1
-		append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
-	fi
-
-	if use x86; then
-		append-flags -falign-functions=4
-	fi
-
-	# QA issue with lisp.run
-	append-flags -Wa,--noexecstack
-
-	# built-in features
-	local myconf="--with-ffcall --without-dynamic-modules"
-#    There's a problem with jit_allocai function
-#    if use jit; then
-#        myconf+=" --with-jitc=lightning"
-#    fi
-	if use threads; then
-		myconf+=" --with-threads=POSIX_THREADS"
-	fi
-
-	# default modules
-	enable_modules wildcard rawsock
-	# optional modules
-	use elibc_glibc && enable_modules bindings/glibc
-	use X && enable_modules clx/new-clx
-	if use postgres; then
-		enable_modules postgresql
-		append-cppflags -I$(pg_config --includedir)
-	fi
-	if use berkdb; then
-		enable_modules berkeley-db
-		append-cppflags -I/usr/include/db4.8
-	fi
-	use dbus && enable_modules dbus
-	use fastcgi && enable_modules fastcgi
-	use gdbm && enable_modules gdbm
-	use gtk && enable_modules gtk2
-	use pari && enable_modules pari
-	use pcre && enable_modules pcre
-	use svm && enable_modules libsvm
-	use zlib && enable_modules zlib
-
-	if use hyperspec; then
-		CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
-	else
-		CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
-	fi
-
-	# configure chokes on --sysconfdir option
-	local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \
-		$(use_with readline) $(use_with unicode) \
-		${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
-	einfo "${configure}"
-	${configure} || die "./configure failed"
-
-	IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
-	sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
-		"${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}"/fonts
-	cd "${BUILDDIR}"
-	# parallel build fails
-	emake -j1
-}
-
-src_install() {
-	pushd "${BUILDDIR}"
-	make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
-	doman clisp.1
-	dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
-	# stripping them removes common symbols (defined but uninitialised variables)
-	# which are then needed to build modules...
-	export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
-	popd
-	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
-	dodoc doc/{CLOS-guide,LISP-tutorial}.txt
-}
diff --git a/dev-lisp/clisp/clisp-2.49-r101.ebuild b/dev-lisp/clisp/clisp-2.49-r101.ebuild
deleted file mode 100644
index 8948b19aea61..000000000000
--- a/dev-lisp/clisp/clisp-2.49-r101.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
-HOMEPAGE="http://clisp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2/7"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
-# "jit" disabled ATM
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3
-		 virtual/libiconv
-		 >=dev-libs/libsigsegv-2.4
-		 >=dev-libs/ffcall-1.10
-		 dbus? ( sys-apps/dbus )
-		 fastcgi? ( dev-libs/fcgi )
-		 gdbm? ( sys-libs/gdbm )
-		 gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 )
-		 pari? ( <sci-mathematics/pari-2.5.0 )
-		 postgres? ( >=dev-db/postgresql-8.0:* )
-		 readline? ( >=sys-libs/readline-7.0:0= )
-		 pcre? ( dev-libs/libpcre:3 )
-		 svm? ( sci-libs/libsvm )
-		 zlib? ( sys-libs/zlib )
-		 X? ( x11-libs/libXpm )
-		 hyperspec? ( dev-lisp/hyperspec )
-		 berkdb? ( sys-libs/db:4.8 )"
-#		 jit? ( >=dev-libs/lightning-1.2 )
-
-DEPEND="${RDEPEND}
-	X? ( x11-misc/imake x11-proto/xextproto )"
-
-enable_modules() {
-	[[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
-	for m in "$@" ; do
-		einfo "enabling module $m"
-		myconf+=" --with-module=${m}"
-	done
-}
-
-BUILDDIR="builddir"
-
-# modules not enabled:
-#  * berkdb: must figure out a way to make the configure script pick up the
-#            currect version of the library and headers
-#  * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
-#  * matlab, netica: not in portage
-#  * oracle: can't install oracle-instantclient
-
-src_prepare() {
-	# More than -O1 breaks alpha/ia64
-	if use alpha || use ia64; then
-		sed -i -e 's/-O2//g' src/makemake.in || die
-	fi
-	epatch "${FILESDIR}"/${P}-bits_ipctypes_to_sys_ipc.patch
-	epatch "${FILESDIR}"/${P}-get_hostname.patch
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-	# bug #594552
-	epatch "${FILESDIR}"/${P}-readline-7.patch
-}
-
-src_configure() {
-	# Bug 618170. If anyone has a better idea...
-	append-flags -fno-pie
-
-	# We need this to build on alpha/ia64
-	if use alpha || use ia64; then
-		replace-flags -O? -O1
-		append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
-	fi
-
-	if use x86; then
-		append-flags -falign-functions=4
-	fi
-
-	# QA issue with lisp.run
-	append-flags -Wa,--noexecstack
-
-	# built-in features
-	local myconf="--with-ffcall --without-dynamic-modules"
-#    There's a problem with jit_allocai function
-#    if use jit; then
-#        myconf+=" --with-jitc=lightning"
-#    fi
-	if use threads; then
-		myconf+=" --with-threads=POSIX_THREADS"
-	fi
-
-	# default modules
-	enable_modules wildcard rawsock
-	# optional modules
-	use elibc_glibc && enable_modules bindings/glibc
-	use X && enable_modules clx/new-clx
-	if use postgres; then
-		enable_modules postgresql
-		append-cppflags -I$(pg_config --includedir)
-	fi
-	if use berkdb; then
-		enable_modules berkeley-db
-		append-cppflags -I/usr/include/db4.8
-	fi
-	use dbus && enable_modules dbus
-	use fastcgi && enable_modules fastcgi
-	use gdbm && enable_modules gdbm
-	use gtk && enable_modules gtk2
-	use pari && enable_modules pari
-	use pcre && enable_modules pcre
-	use svm && enable_modules libsvm
-	use zlib && enable_modules zlib
-
-	if use hyperspec; then
-		CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
-	else
-		CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
-	fi
-
-	# configure chokes on --sysconfdir option
-	local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \
-		$(use_with readline) $(use_with unicode) \
-		${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
-	einfo "${configure}"
-	${configure} || die "./configure failed"
-
-	IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
-	sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
-		"${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}"/fonts
-	cd "${BUILDDIR}"
-	# parallel build fails
-	emake -j1
-}
-
-src_install() {
-	pushd "${BUILDDIR}"
-	make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
-	doman clisp.1
-	dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
-	# stripping them removes common symbols (defined but uninitialised variables)
-	# which are then needed to build modules...
-	export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
-	popd
-	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
-	dodoc doc/{CLOS-guide,LISP-tutorial}.txt
-}
diff --git a/dev-lisp/clisp/clisp-2.49-r8.ebuild b/dev-lisp/clisp/clisp-2.49-r8.ebuild
deleted file mode 100644
index e19e47f63f6c..000000000000
--- a/dev-lisp/clisp/clisp-2.49-r8.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
-HOMEPAGE="http://clisp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2/${PV}"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
-# "jit" disabled ATM
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3
-		 virtual/libiconv
-		 >=dev-libs/libsigsegv-2.4
-		 >=dev-libs/ffcall-1.10
-		 dbus? ( sys-apps/dbus )
-		 fastcgi? ( dev-libs/fcgi )
-		 gdbm? ( sys-libs/gdbm )
-		 gtk? ( >=x11-libs/gtk+-2.10 >=gnome-base/libglade-2.6 )
-		 pari? ( <sci-mathematics/pari-2.5.0 )
-		 postgres? ( >=dev-db/postgresql-8.0 )
-		 readline? ( >=sys-libs/readline-5.0 <sys-libs/readline-7.0 )
-		 pcre? ( dev-libs/libpcre )
-		 svm? ( sci-libs/libsvm )
-		 zlib? ( sys-libs/zlib )
-		 X? ( x11-libs/libXpm )
-		 hyperspec? ( dev-lisp/hyperspec )
-		 berkdb? ( sys-libs/db:4.8 )"
-#		 jit? ( >=dev-libs/lightning-1.2 )
-
-DEPEND="${RDEPEND}
-	X? ( x11-misc/imake x11-proto/xextproto )"
-
-enable_modules() {
-	[[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
-	for m in "$@" ; do
-		einfo "enabling module $m"
-		myconf+=" --with-module=${m}"
-	done
-}
-
-BUILDDIR="builddir"
-
-# modules not enabled:
-#  * berkdb: must figure out a way to make the configure script pick up the
-#            currect version of the library and headers
-#  * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
-#  * matlab, netica: not in portage
-#  * oracle: can't install oracle-instantclient
-
-src_prepare() {
-	# More than -O1 breaks alpha/ia64
-	if use alpha || use ia64; then
-		sed -i -e 's/-O2//g' src/makemake.in || die
-	fi
-	epatch "${FILESDIR}"/${P}-bits_ipctypes_to_sys_ipc.patch
-	epatch "${FILESDIR}"/${P}-get_hostname.patch
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-}
-
-src_configure() {
-	# We need this to build on alpha/ia64
-	if use alpha || use ia64; then
-		replace-flags -O? -O1
-		append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
-	fi
-
-	# QA issue with lisp.run
-	append-flags -Wa,--noexecstack
-
-	# built-in features
-	local myconf="--with-ffcall --without-dynamic-modules"
-#    There's a problem with jit_allocai function
-#    if use jit; then
-#        myconf+=" --with-jitc=lightning"
-#    fi
-	if use threads; then
-		myconf+=" --with-threads=POSIX_THREADS"
-	fi
-
-	# default modules
-	enable_modules wildcard rawsock
-	# optional modules
-	use elibc_glibc && enable_modules bindings/glibc
-	use X && enable_modules clx/new-clx
-	if use postgres; then
-		enable_modules postgresql
-		append-cppflags -I$(pg_config --includedir)
-	fi
-	if use berkdb; then
-		enable_modules berkeley-db
-		append-cppflags -I/usr/include/db4.8
-	fi
-	use dbus && enable_modules dbus
-	use fastcgi && enable_modules fastcgi
-	use gdbm && enable_modules gdbm
-	use gtk && enable_modules gtk2
-	use pari && enable_modules pari
-	use pcre && enable_modules pcre
-	use svm && enable_modules libsvm
-	use zlib && enable_modules zlib
-
-	if use hyperspec; then
-		CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
-	else
-		CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
-	fi
-
-	# configure chokes on --sysconfdir option
-	local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \
-		$(use_with readline) $(use_with unicode) \
-		${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
-	einfo "${configure}"
-	${configure} || die "./configure failed"
-
-	IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
-	sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
-		"${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}"/fonts
-	cd "${BUILDDIR}"
-	# parallel build fails
-	emake -j1
-}
-
-src_install() {
-	pushd "${BUILDDIR}"
-	make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
-	doman clisp.1
-	dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
-	# stripping them removes common symbols (defined but uninitialised variables)
-	# which are then needed to build modules...
-	export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
-	popd
-	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
-	dodoc doc/{CLOS-guide,LISP-tutorial}.txt
-}
diff --git a/dev-lisp/clisp/clisp-2.49.60.ebuild b/dev-lisp/clisp/clisp-2.49.60.ebuild
deleted file mode 100644
index 84dc47a3bc6a..000000000000
--- a/dev-lisp/clisp/clisp-2.49.60.ebuild
+++ /dev/null
@@ -1,147 +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
-
-DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
-HOMEPAGE="http://clisp.sourceforge.net/"
-SRC_URI="https://haible.de/bruno/gnu/clisp-2.49.60.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2/7"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
-# "jit" disabled ATM
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3
-		 virtual/libiconv
-		 >=dev-libs/libsigsegv-2.10
-		 >=dev-libs/ffcall-1.10
-		 dbus? ( sys-apps/dbus )
-		 fastcgi? ( dev-libs/fcgi )
-		 gdbm? ( sys-libs/gdbm )
-		 gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 )
-		 pari? ( <sci-mathematics/pari-2.5.0 )
-		 postgres? ( >=dev-db/postgresql-8.0:* )
-		 readline? ( >=sys-libs/readline-7.0:0= )
-		 pcre? ( dev-libs/libpcre:3 )
-		 svm? ( sci-libs/libsvm )
-		 zlib? ( sys-libs/zlib )
-		 X? ( x11-libs/libXpm )
-		 hyperspec? ( dev-lisp/hyperspec )
-		 berkdb? ( sys-libs/db:4.8 )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-misc/imake x11-proto/xextproto )"
-
-enable_modules() {
-	[[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
-	for m in "$@" ; do
-		einfo "enabling module $m"
-		myconf+=" --with-module=${m}"
-	done
-}
-
-BUILDDIR="builddir"
-
-# modules not enabled:
-#  * berkdb: must figure out a way to make the configure script pick up the
-#            currect version of the library and headers
-#  * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
-#  * matlab, netica: not in portage
-#  * oracle: can't install oracle-instantclient
-
-src_prepare() {
-	# More than -O1 breaks alpha/ia64
-	if use alpha || use ia64; then
-		sed -i -e 's/-O2//g' src/makemake.in || die
-	fi
-	eapply "${FILESDIR}"/"${P}"-after_glibc_cfree_bdb.patch
-	eapply_user
-}
-
-src_configure() {
-	# We need this to build on alpha/ia64
-	if use alpha || use ia64; then
-		replace-flags -O? -O1
-		append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
-	fi
-
-	if use x86; then
-		append-flags -falign-functions=4
-	fi
-
-	# QA issue with lisp.run
-	append-flags -Wa,--noexecstack
-
-	# built-in features
-	local myconf="--with-ffcall --without-dynamic-modules"
-#    There's a problem with jit_allocai function
-#    if use jit; then
-#        myconf+=" --with-jitc=lightning"
-#    fi
-	if use threads; then
-		myconf+=" --with-threads=POSIX_THREADS"
-	fi
-
-	# default modules
-	enable_modules rawsock
-	# optional modules
-	use elibc_glibc && enable_modules bindings/glibc
-	use X && enable_modules clx/new-clx
-	if use postgres; then
-		enable_modules postgresql
-		append-cppflags -I$(pg_config --includedir)
-	fi
-	if use berkdb; then
-		enable_modules berkeley-db
-		append-cppflags -I/usr/include/db4.8
-	fi
-	use dbus && enable_modules dbus
-	use fastcgi && enable_modules fastcgi
-	use gdbm && enable_modules gdbm
-	use gtk && enable_modules gtk2
-	use pari && enable_modules pari
-	use pcre && enable_modules pcre
-	use svm && enable_modules libsvm
-	use zlib && enable_modules zlib
-
-	if use hyperspec; then
-		CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
-	else
-		CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
-	fi
-
-	# configure chokes on --sysconfdir option
-	local configure="./configure --prefix=/usr --enable-portability \
-		  --libdir=/usr/$(get_libdir) $(use_with readline) $(use_with unicode) \
-		  ${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
-	einfo "${configure}"
-	${configure} || die "./configure failed"
-
-	IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
-	sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
-		"${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}"/fonts
-	cd "${BUILDDIR}" || die
-	# parallel build fails
-	emake -j1
-}
-
-src_install() {
-	pushd "${BUILDDIR}"
-	make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
-	doman clisp.1
-	dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
-	# stripping them removes common symbols (defined but uninitialised variables)
-	# which are then needed to build modules...
-	export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
-	popd
-	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
-	dodoc doc/{CLOS-guide,LISP-tutorial}.txt
-}
diff --git a/dev-lisp/clisp/clisp-2.49.90.ebuild b/dev-lisp/clisp/clisp-2.49.90.ebuild
index e1167a08a895..ba1830176a3f 100644
--- a/dev-lisp/clisp/clisp-2.49.90.ebuild
+++ b/dev-lisp/clisp/clisp-2.49.90.ebuild
@@ -93,7 +93,7 @@ src_configure() {
 	fi
 	if use berkdb; then
 		enable_modules berkeley-db
-		append-cppflags -I/usr/include/db4.8
+		append-cppflags -I"${EPREFIX}"/usr/include/db4.8
 	fi
 	use dbus && enable_modules dbus
 	use fastcgi && enable_modules fastcgi
@@ -105,14 +105,14 @@ src_configure() {
 	use zlib && enable_modules zlib
 
 	if use hyperspec; then
-		CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
+		CLHSROOT="file:///${EPREFIX}/usr/share/doc/hyperspec/HyperSpec/"
 	else
 		CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
 	fi
 
 	# configure chokes on --sysconfdir option
-	local configure="./configure --prefix=/usr --enable-portability \
-		  --libdir=/usr/$(get_libdir) $(use_with readline) $(use_with unicode) \
+	local configure="./configure --prefix=${EPREFIX}/usr --enable-portability \
+		  --libdir=${EPREFIX}/usr/$(get_libdir) $(use_with readline) $(use_with unicode) \
 		  ${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
 	einfo "${configure}"
 	${configure} || die "./configure failed"
@@ -131,12 +131,12 @@ src_compile() {
 
 src_install() {
 	pushd "${BUILDDIR}"
-	make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
+	make DESTDIR="${D}" prefix="${EPREFIX}"/usr install-bin || die "Installation failed"
 	doman clisp.1
 	dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
 	# stripping them removes common symbols (defined but uninitialised variables)
 	# which are then needed to build modules...
-	export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
+	export STRIP_MASK="*${EPREFIX}/usr/$(get_libdir)/clisp-${PV}/*/*"
 	popd
 	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
 	dodoc doc/{CLOS-guide,LISP-tutorial}.txt
diff --git a/dev-lisp/clisp/files/clisp-2.48-bits_ipctypes_to_sys_ipc.patch b/dev-lisp/clisp/files/clisp-2.48-bits_ipctypes_to_sys_ipc.patch
deleted file mode 100644
index 4711a86decbe..000000000000
--- a/dev-lisp/clisp/files/clisp-2.48-bits_ipctypes_to_sys_ipc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru a/modules/bindings/glibc/linux.lisp b/modules/bindings/glibc/linux.lisp
---- a/modules/bindings/glibc/linux.lisp	2008-10-10 16:15:49.000000000 +0300
-+++ b/modules/bindings/glibc/linux.lisp	2013-04-22 11:12:59.148502615 +0300
-@@ -67,7 +67,7 @@
- (def-c-type __daddr_t)          ; int
- (def-c-type __caddr_t)          ; c-pointer
- (def-c-type __time_t)           ; long
--(def-c-type __swblk_t)          ; long
-+;(def-c-type __swblk_t)          ; long
- 
- (def-c-type __fd_mask ulong)
- (eval-when (load compile eval)
-@@ -86,7 +86,7 @@
- 
- (def-c-type __key_t)            ; int
- 
--(c-lines "#include <bits/ipctypes.h>~%")
-+(c-lines "#include <sys/ipc.h>~%")
- (def-c-type __ipc_pid_t)        ; ushort
- 
- ; --------------------------- <sys/types.h> -----------------------------------
diff --git a/dev-lisp/clisp/files/clisp-2.49-readline-7.patch b/dev-lisp/clisp/files/clisp-2.49-readline-7.patch
deleted file mode 100644
index 0be5bd8ccc20..000000000000
--- a/dev-lisp/clisp/files/clisp-2.49-readline-7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 clisp-2.49.orig/modules/readline/readline.lisp clisp-2.49/modules/readline/readline.lisp
---- clisp-2.49.orig/modules/readline/readline.lisp	2010-01-07 04:18:03.000000000 +0600
-+++ clisp-2.49/modules/readline/readline.lisp	2016-09-29 22:23:53.837631568 +0700
-@@ -425,5 +425,5 @@
- (def-c-var gnu-readline-p (:name "rl_gnu_readline_p") (:type int)
-   (:documentation "True if this is real GNU readline."))
--(def-c-var readline-state (:name "rl_readline_state") (:type int)
-+(def-c-var readline-state (:name "rl_readline_state") (:type ulong)
-   (:documentation "Flags word encapsulating the current readline state."))
- (def-c-var editing-mode (:name "rl_editing_mode") (:type int)
diff --git a/dev-lisp/clisp/files/clisp-2.49.60-after_glibc_cfree_bdb.patch b/dev-lisp/clisp/files/clisp-2.49.60-after_glibc_cfree_bdb.patch
deleted file mode 100644
index 3ab075badf4a..000000000000
--- a/dev-lisp/clisp/files/clisp-2.49.60-after_glibc_cfree_bdb.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff --git a/modules/berkeley-db/bdb.c b/modules/berkeley-db/bdb.c
-index a266d41..942652a 100644
---- a/modules/berkeley-db/bdb.c
-+++ b/modules/berkeley-db/bdb.c
-@@ -2216,7 +2216,13 @@ DEFUN(BDB:DB-COMPACT, db &key TRANSACTION :START STOP FREE FILL TIMEOUT \
-   c_data.compact_timeout = timeout;
-   c_data.compact_pages = pages;
-   SYSCALL(db->compact,(db,txn,pstart,pstop,&c_data,flags,&end));
--  pushSTACK(uint32_to_I(c_data.compact_empty_buckets));
-+  /* ====
-+   * compact_empty_buckets is in bdb-5.3 as part of output stats
-+   * however this version use bdb-4.8 which does not have it
-+   * ====
-+   *
-+   * pushSTACK(uint32_to_I(c_data.compact_empty_buckets));
-+   * */
-   pushSTACK(uint32_to_I(c_data.compact_pages_free));
-   pushSTACK(uint32_to_I(c_data.compact_pages_examine));
-   pushSTACK(uint32_to_I(c_data.compact_levels));
-diff --git a/modules/bindings/glibc/linux.lisp b/modules/bindings/glibc/linux.lisp
-index c960753..2993990 100644
---- a/modules/bindings/glibc/linux.lisp
-+++ b/modules/bindings/glibc/linux.lisp
-@@ -1,7 +1,7 @@
- ;; Foreign functions provided by the Linux C library version 6,
- ;; i.e. the GNU C library version 2.0.7.
- ;; Bruno Haible 10.4.1998, 19.4.1998
--;; Sam Steingold 2002-2008, 2011
-+;; Sam Steingold 2002-2008, 2011, 2013, 2016-2017
- 
- ;; NB: quite a few functions here have more portable counterparts in POSIX
- 
-@@ -649,7 +649,6 @@
- (def-call-out calloc (:arguments (nmemb size_t) (size size_t))
-   (:return-type c-pointer))
- (def-call-out free (:arguments (ptr c-pointer)) (:return-type nil))
--(def-call-out cfree (:arguments (ptr c-pointer)) (:return-type nil))
- (def-call-out valloc (:arguments (size size_t)) (:return-type c-pointer))
- 
- (def-call-out abort (:arguments) (:return-type nil))
-@@ -687,9 +686,8 @@
- (def-call-out system? (:arguments (null c-string))
-   (:return-type boolean) (:name "system"))
- 
--; You can uncomment this if your compiler sets __USE_GNU
--; (def-call-out canonicalize_file_name (:arguments (name c-string))
--;  (:return-type c-string :malloc-free))
-+(def-call-out canonicalize_file_name (:arguments (name c-string))
-+  (:return-type c-string :malloc-free) (:guard "defined(__USE_GNU)"))
- 
- (def-call-out realpath
-     (:arguments (name c-string)
-@@ -1041,9 +1039,8 @@
- (def-call-out access (:arguments (name c-string) (type int))
-   (:return-type int))
- 
--; You can uncomment this if your compiler sets __USE_GNU
--; (def-call-out euidaccess (:arguments (name c-string) (type int))
--;   (:return-type int))
-+(def-call-out euidaccess (:arguments (name c-string) (type int))
-+  (:return-type int) (:guard "defined(__USE_GNU)"))
- 
- (defconstant SEEK_SET 0)
- (defconstant SEEK_CUR 1)
-@@ -1094,9 +1091,8 @@
- ;(def-call-out getcwd (:arguments (buf c-string :out) (size size_t)) ; ??
- ;  (:return-type c-string))
- 
--; You can uncomment this if your compiler sets __USE_GNU
--; (def-call-out get_current_dir_name (:arguments)
--;   (:return-type c-string :malloc-free))
-+(def-call-out get_current_dir_name (:arguments)
-+  (:return-type c-string :malloc-free) (:guard "defined(__USE_GNU)"))
- 
- ;(def-call-out getwd (:arguments (buf c-string :out)) ; ??
- ;  (:return-type c-string))
-@@ -1324,8 +1320,8 @@
- ;    (:arguments (size int) (list (c-ptr (c-array gid_t ??)) :out)) ; ??
- ;  (:return-type int))
- 
--; You can uncomment this if your compiler sets __USE_GNU
--; (def-call-out group_member (:arguments (gid gid_t)) (:return-type boolean))
-+(def-call-out group_member (:arguments (gid gid_t)) (:return-type boolean)
-+   (:guard "defined(__USE_GNU)"))
- (def-call-out setuid (:arguments (uid uid_t)) (:return-type int))
- (def-call-out setreuid (:arguments (ruid uid_t) (euid uid_t))
-   (:return-type int))
-@@ -1822,8 +1818,8 @@
-   (:return-type c-string :malloc-free))
- (def-call-out ungetc (:arguments (c int) (fp FILE))
-   (:return-type int))
--; You can uncomment this if your compiler sets __USE_GNU
--; (def-call-out fcloseall (:arguments) (:return-type int))
-+(def-call-out fcloseall (:arguments) (:return-type int)
-+  (:guard "defined(__USE_GNU)"))
- (def-call-out fdopen (:arguments (fildes int) (mode c-string))
-   (:return-type c-pointer))
- (def-call-out fileno (:arguments (fp FILE)) (:return-type int))
-@@ -1901,11 +1897,11 @@ typedef __off64_t clisp_dirent_off_t;
-   (:return-type (c-ptr-null dirent)))
- (def-call-out readdir64 (:arguments (dirp c-pointer))
-   (:return-type (c-ptr-null dirent64)))
--(def-call-out readdir_r
-+(def-call-out readdir_r                 ; deprecated
-     (:arguments (dirp c-pointer) (entry (c-ptr dirent) :out :alloca)
-                 (result (c-ptr (c-ptr dirent)) :out :alloca)) ; ??
-   (:return-type int))
--(def-call-out readdir64_r
-+(def-call-out readdir64_r               ; deprecated
-     (:arguments (dirp c-pointer) (entry (c-ptr dirent64) :out :alloca)
-                 (result (c-ptr (c-ptr dirent64)) :out :alloca)) ; ??
-   (:return-type int))
-diff --git a/modules/bindings/glibc/test.tst b/modules/bindings/glibc/test.tst
-index f807389..b2c1222 100644
---- a/modules/bindings/glibc/test.tst
-+++ b/modules/bindings/glibc/test.tst
-@@ -5,6 +5,16 @@
- (progn (require "linux") T) T
- (listp (show (multiple-value-list (ext:module-info "linux" t)) :pretty t)) T
- 
-+(stringp (show (linux:get-domain-name))) T
-+(stringp (show (linux:get-host-name))) T
-+
-+;; usually __USE_GNU is defined, so this should work:
-+(let* ((d (linux:get_current_dir_name))
-+       (c (linux:canonicalize_file_name (concatenate 'string d "/."))))
-+  (or (string= d c)
-+      (list :cur-dir d :canonical c)))
-+T
-+
- (defparameter *d* (show (linux:opendir "."))) *D*
- (linux:dirent64-d_name (show (linux:readdir64 *d*))) "."
- (linux:dirent64-d_name (show (linux:readdir64 *d*))) ".."
-diff --git a/src/foreign1.lisp b/src/foreign1.lisp
-index 26a3ba5..0e43de7 100644
---- a/src/foreign1.lisp
-+++ b/src/foreign1.lisp
-@@ -1,6 +1,6 @@
- ;;; Foreign function interface for CLISP
- ;;; Bruno Haible 19.2.1995
--;;; Sam Steingold 1998-2010
-+;;; Sam Steingold 1998-2010, 2017
- 
- #+UNICODE
- (progn
-@@ -805,14 +805,17 @@
-                 c-name (to-c-string c-name) (third variable) (first variable))
-         (when *foreign-guard* (format *coutput-stream* "# endif~%"))))
-     (dolist (function *function-list*)
--      (let ((c-name (first function)))
--        (when *foreign-guard*
--          (format *coutput-stream* "# if defined(HAVE_~A)~%"
--                  (string-upcase c-name)))
-+      (let ((c-name (first function))
-+            (guard (fourth function)))
-+        (when guard
-+          (format *coutput-stream* "# if ~A~%"
-+                  (if (eq guard t)
-+                      (format nil "defined(HAVE_~A)" (string-upcase c-name))
-+                      guard)))
-         (format *coutput-stream*
-                 "  register_foreign_function((void*)&~A,~A,~D);~%"
-                 c-name (to-c-string c-name) (svref (second function) 3))
--        (when *foreign-guard* (format *coutput-stream* "# endif~%"))))
-+        (when guard (format *coutput-stream* "# endif~%"))))
-     (maphash (lambda (type fun-vec)
-                (declare (ignore type))
-                (let ((c-name (to-c-name (car fun-vec))))
-@@ -1083,7 +1086,7 @@
- (defmacro DEF-CALL-OUT (&whole whole-form name &rest options)
-   (setq name (check-symbol name (first whole-form)))
-   (let* ((alist
--          (parse-options options '(:name :arguments :return-type :language
-+          (parse-options options '(:name :arguments :return-type :language :guard
-                                    :built-in :library :version :documentation)
-                          whole-form))
-          (def (gensym "DEF-CALL-OUT-"))
-@@ -1095,6 +1098,7 @@
-          (version (second (assoc :version alist)))
-          (c-name (foreign-name name (assoc :name alist)))
-          (built-in (second (assoc :built-in alist)))
-+         (guard (get-assoc :guard alist '*foreign-guard*))
-          ;; Maximize sharing in .fas file, reuse options
-          ;; parse-c-function ignores unknown options, e.g. :name
-          (ctype `(PARSE-C-FUNCTION ',options ',whole-form)))
-@@ -1102,7 +1106,7 @@
-                   ',c-name ,ctype ',properties ,library ,version NIL)))
-        (EXT:COMPILER-LET ((,def ,ctype))
-          (EVAL-WHEN (COMPILE)
--           (UNLESS ,LIBRARY (NOTE-C-FUN ',c-name ,def ',built-in)))
-+           (UNLESS ,LIBRARY (NOTE-C-FUN ',c-name ,def ',built-in ,guard)))
-          (SYSTEM::EVAL-WHEN-COMPILE
-            (SYSTEM::C-DEFUN ',name (C-TYPE-TO-SIGNATURE ,ctype))))
-        (WHEN ,def                       ; found library function
-@@ -1110,10 +1114,10 @@
-          (SYSTEM::%PUTD ',name ,def))
-        ',name)))
- 
--(defun note-c-fun (c-name ctype built-in) ; not ABI, compile-time only
-+(defun note-c-fun (c-name ctype built-in guard) ; not ABI, compile-time only
-   (when (system::prepare-coutput-file)
-     (prepare-module)
--    (push (list c-name ctype built-in)
-+    (push (list c-name ctype built-in guard)
-           *function-list*)))
- 
- (defun count-inarguments (arg-vector)
diff --git a/dev-lisp/clisp/metadata.xml b/dev-lisp/clisp/metadata.xml
index 256106c8ea32..a78f41563fce 100644
--- a/dev-lisp/clisp/metadata.xml
+++ b/dev-lisp/clisp/metadata.xml
@@ -21,7 +21,7 @@ changed at run time.
 	<use>
 		<flag name="hyperspec">Use local hyperspec instead of online version</flag>
 		<flag name="new-clx">Build CLISP with support for the NEW-CLX module which is a
-C binding to the Xorg libraries</flag>
+-C binding to the Xorg libraries</flag>
 		<flag name="pari">Build CLISP with support for the PARI Computer Algebra System</flag>
 		<flag name="svm">Build CLISP with support for the Support Vector Machine module</flag>
 	</use>
diff --git a/dev-lisp/uiop/Manifest b/dev-lisp/uiop/Manifest
index 37033f6d299f..c521acf68847 100644
--- a/dev-lisp/uiop/Manifest
+++ b/dev-lisp/uiop/Manifest
@@ -1,17 +1,7 @@
-DIST asdf-3.0.3.tar.gz 427575 BLAKE2B e237a60982beff858a6aaf90736a54be0f7fec7d4d26c8bb370cab50e743df291e88372579318501cd199734119cfbdea6cde51ac3b5ca5af9e22e8b2b032052 SHA512 d9d8d466c7b6aa6beb1c22da4fd10499fa784c39ab138bea7ecb8cdccf769766572ebe91c89db2d5c53e493096248f82a224be95c1fcac8b7beebe1b57f34883
 DIST asdf-3.1.5.tar.gz 400359 BLAKE2B 586a66799a37259694baa673f2849e183fac5fedfe5ff5c92529d47fc0954d40b48bbc095db926b9ea2214b551729c269d0925e4396a52310b72fd5f21842f49 SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516
-DIST asdf-3.1.6.tar.gz 396066 BLAKE2B 4cf18e83eb62448f4eb29a38a44d9cd5a0d5393ecaba4d1eacdc2a41e02989bea632a7ae4f583a4b6a7fcd6f24351a1d65179a6c06f2c22ed9d1bc8cc24c9b0b SHA512 3203bef1ce4c2d28306ca1ee214d3d5fd04b3d2caa61f606d0334f100358bfbd9b03d69c95e83734175639a91e76aeac509e949768fc694817631078671a9bc1
-DIST asdf-3.1.7.tgz 402257 BLAKE2B f6bafb3843fef8ca566c89aa64f8987656fcf7cb262cdb97d3f797e296e32c9d9fe7115b4019bf93eea4b891b36d3d81a589be6e5506035c004a0552d81756d7 SHA512 ebe2ddf702f6200bf98408fb262e9929565c9d29bcd874dd2657a6f84e123b0153a78e457fb425d48a05c427f7c090ab5fd0e6201223eb4b296b3b4cd5b57c26
-DIST asdf-3.2.0.tar.gz 438536 BLAKE2B aed96ab33e33a1aa996dd0be6cc0d230cde0d11510332677837230dde3480f3c85ef1f09085f3d85197b0c441b0fd29269522539a5475b5a994e091e3af8046e SHA512 2c273aa7b1049c1a8f4da5d195ac7c2cceba238228508847b5afbed8a258ad49e6b346e79b07d0347be0326d3558ed881838fe8461a6d45cc3f2d58380789fcb
-DIST asdf-3.2.1.tar.gz 460536 BLAKE2B 080398a9a2bdd48b2ce08dad939b997dea8e7f23ee0012fbfccbe7ae0f72d24b832730e5c6bf5383a6e4753cd1226f08c5450a6636266b70e7590c9970cbc751 SHA512 686881536126eb6ffb7e9db763aec02e1ad7ab4df60cc96d094bc4cebb95453e3d57273cb925471c7ee13e4378ca3c0d697c416b7374ad07148e11d89aee85b0
 DIST asdf-3.3.0.tar.gz 498451 BLAKE2B dea8e659eab482604067f5989c766b52b9bc4f0bafeb7a12508520abf686dde730225dbc3063291dd334b1a97a41d04b4207be4680ae0cae9a4207222eda7b43 SHA512 4e8b3434d9eb504af253fa39ac759cceb7ea0c3e2c364875d7259b32a9818b051fb2a3c94c188c7f38e43825e2a18107f1732211534a8b1fbbaa77b6c7f90486
 DIST asdf-3.3.1.tar.gz 479255 BLAKE2B 5161b79741a52721eaa4da80a61bbe51e924967ecb744a087fdcbd99407abcc42faf39eafe6d30af7dd8af751a80caaf23e93ce42aa5f584123a1e8b528cc613 SHA512 bf5efec4518eb5312ce743c0fbe60c587bebfe26c36c833c163d67bf8631e18eeb293f2185e547f6be10da061a17f024d9f4a3a0808727d7b9b3a7d7a0faf133
-EBUILD uiop-3.0.3.ebuild 797 BLAKE2B 039e3d7d34866a2843875e5d058965521b4694717fce895187ba5ca769bd5bc31014411fb26a4d54ec6bd9adc897def053bc114a6ab55ea719dd45b2c212af6a SHA512 b9899eee938e8e013ccc2400997b8ee3e9070bf6836171bbddd416baecf67ae957bb9901dde39f26e22b72bb0104dd64091e24c30883e4656cac0649cf2dc6be
-EBUILD uiop-3.1.5.ebuild 878 BLAKE2B d826c764234bc4f36ce30d7e0a26aa5f740e13204fcf28b58b22af0f94bd9136fb6e94127cbd5c7a8a97bcd69af662bf9f1c3a9eb9ddff60ad9d9a0845e3be7c SHA512 dd1e7cc9d1cd22d5740733652b587c6f0409ce28551a6293f534709f00598e4f41bc945b65d52e4ca47f392d43bc82b91b96bc0b112bdf83c0b5a1683f17fda6
-EBUILD uiop-3.1.6.ebuild 871 BLAKE2B 732369e7bd680a64c900759064d51bcd0f70d65cc1f3e4178e8bbcff8317617d1fd131390b95483b3401dd684cca75bed9e06e4173d5969a794686e72fcd4c9f SHA512 d1a46364aa2a55e3bf474d9ec5a9187657510f0497fbbae743229737017ba5bbb66f75080c72227c833b6a3ac4ffcdab34b0633ea0c8c287645b38c418ba668c
-EBUILD uiop-3.1.7.ebuild 795 BLAKE2B f6c2ac6777c09eff6b4176bfbf347c96c3e63fb5427985c61a196d25db6cd2c4630855678407d29b82085f76d6082a75e888e6e1be6af25e431c75d5e0bf8f00 SHA512 dbd0ab07ecd5b6fd80153de10b39593af511ce1e929b4e9d9fc1037782469335679725c84d1028642ee1c2d613a5a2583000c8288cc93ca1188fa9a65dff37cb
-EBUILD uiop-3.2.0.ebuild 809 BLAKE2B 085a8819b62018aeea1a6b98ea4793fcfd83c2d873cff66f8e82a40ecbef6001f3d08154d68d81a37ae19b1f6da4081a47ea38b4573ef248e534ada50c92cddf SHA512 7ca137a6496e41b7a1c8ffdc99990aab7d54bb20887357f23422f4411d32a50c9eb299e1e86bdbf118063a1bbe182f5d889efbe7b5bae65db8f07a8dbdc9aadc
-EBUILD uiop-3.2.1.ebuild 809 BLAKE2B 085a8819b62018aeea1a6b98ea4793fcfd83c2d873cff66f8e82a40ecbef6001f3d08154d68d81a37ae19b1f6da4081a47ea38b4573ef248e534ada50c92cddf SHA512 7ca137a6496e41b7a1c8ffdc99990aab7d54bb20887357f23422f4411d32a50c9eb299e1e86bdbf118063a1bbe182f5d889efbe7b5bae65db8f07a8dbdc9aadc
+EBUILD uiop-3.1.5.ebuild 884 BLAKE2B b065886d1584fe4619656585052a601bbb66a2a7873ea4f4ed2a3e46186d428551745398bcf8e1efd9e2b3b2045ce34d618b269674370e66a9b82f33bcee9476 SHA512 7c3d2beb186769971aa6b13f6253dd1dff378a997c03f56e4d0a98f2113c8dfddf6997a1a29a59b71cbaf691cbee9041c45422ce75e09ee75bc00e4d0c4b0914
 EBUILD uiop-3.3.0.ebuild 809 BLAKE2B 085a8819b62018aeea1a6b98ea4793fcfd83c2d873cff66f8e82a40ecbef6001f3d08154d68d81a37ae19b1f6da4081a47ea38b4573ef248e534ada50c92cddf SHA512 7ca137a6496e41b7a1c8ffdc99990aab7d54bb20887357f23422f4411d32a50c9eb299e1e86bdbf118063a1bbe182f5d889efbe7b5bae65db8f07a8dbdc9aadc
 EBUILD uiop-3.3.1.ebuild 809 BLAKE2B 085a8819b62018aeea1a6b98ea4793fcfd83c2d873cff66f8e82a40ecbef6001f3d08154d68d81a37ae19b1f6da4081a47ea38b4573ef248e534ada50c92cddf SHA512 7ca137a6496e41b7a1c8ffdc99990aab7d54bb20887357f23422f4411d32a50c9eb299e1e86bdbf118063a1bbe182f5d889efbe7b5bae65db8f07a8dbdc9aadc
 MISC metadata.xml 261 BLAKE2B 161dea7ab371cbcbc08b8aac63e402f9fe994c08d55f2291360e900bf73e21f2c2ea67b6fcc3cb000f1cef03d1c41c6d2e5e16dd06d6916ec90d4e54a1ba3dd7 SHA512 fb754c4ed3579db5dbe303197a05647b7cfab0a3fe47fd2140d5f77641be752d10ccf49a9c267406a0f3ba3dcda8831f778b9596d723f65aff10142bfad60d3d
diff --git a/dev-lisp/uiop/uiop-3.0.3.ebuild b/dev-lisp/uiop/uiop-3.0.3.ebuild
deleted file mode 100644
index 65ac464f69ee..000000000000
--- a/dev-lisp/uiop/uiop-3.0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="UIOP is a portability layer spun off ASDF3"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/asdf/archives/asdf-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="~dev-lisp/asdf-${PV}"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	insinto /usr/share/common-lisp/source/${PN}
-	doins -r contrib *.lisp ../version.lisp-expr uiop.asd asdf-driver.asd
-	dodir /usr/share/common-lisp/systems
-	dosym /usr/share/common-lisp/source/${PN}/uiop.asd /usr/share/common-lisp/systems/uiop.asd
-	dosym /usr/share/common-lisp/source/${PN}/asdf-driver.asd /usr/share/common-lisp/systems/asdf-driver.asd
-}
diff --git a/dev-lisp/uiop/uiop-3.1.5.ebuild b/dev-lisp/uiop/uiop-3.1.5.ebuild
index e113df07f3b1..597cdb26d9bd 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 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}"
diff --git a/dev-lisp/uiop/uiop-3.1.6.ebuild b/dev-lisp/uiop/uiop-3.1.6.ebuild
deleted file mode 100644
index 4f22c7320455..000000000000
--- a/dev-lisp/uiop/uiop-3.1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="UIOP is a portability layer spun off ASDF3"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/asdf/archives/asdf-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="~dev-lisp/asdf-${PV}"
-
-S="${WORKDIR}/asdf-${PV}/${PN}"
-
-src_install() {
-	insinto /usr/share/common-lisp/source/${PN}
-	doins -r contrib *.lisp ../version.lisp-expr uiop.asd asdf-driver.asd
-	dodir /usr/share/common-lisp/systems
-	dosym /usr/share/common-lisp/source/${PN}/uiop.asd /usr/share/common-lisp/systems/uiop.asd
-	dosym /usr/share/common-lisp/source/${PN}/asdf-driver.asd /usr/share/common-lisp/systems/asdf-driver.asd
-}
diff --git a/dev-lisp/uiop/uiop-3.1.7.ebuild b/dev-lisp/uiop/uiop-3.1.7.ebuild
deleted file mode 100644
index 0340a992de22..000000000000
--- a/dev-lisp/uiop/uiop-3.1.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit common-lisp-3
-
-DESCRIPTION="UIOP is a portability layer spun off ASDF3"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/asdf/archives/asdf-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="~dev-lisp/asdf-${PV}"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	insinto "${CLSOURCEROOT}/${PN}"
-	doins -r contrib *.lisp ../version.lisp-expr "${PN}.asd" asdf-driver.asd
-	dodir "${CLSYSTEMROOT}"
-	dosym "${CLSOURCEROOT}/${PN}/${PN}.asd" "${CLSYSTEMROOT}/${PN}.asd"
-	dosym "${CLSOURCEROOT}/${PN}/asdf-driver.asd" "${CLSYSTEMROOT}/asdf-driver.asd"
-}
diff --git a/dev-lisp/uiop/uiop-3.2.0.ebuild b/dev-lisp/uiop/uiop-3.2.0.ebuild
deleted file mode 100644
index 354fca8768ef..000000000000
--- a/dev-lisp/uiop/uiop-3.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit common-lisp-3
-
-DESCRIPTION="UIOP is a portability layer spun off ASDF3"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/asdf/archives/asdf-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="~dev-lisp/asdf-${PV}"
-
-S="${WORKDIR}/asdf-${PV}/${PN}"
-
-src_install() {
-	insinto "${CLSOURCEROOT}/${PN}"
-	doins -r contrib *.lisp ../version.lisp-expr "${PN}.asd" asdf-driver.asd
-	dodir "${CLSYSTEMROOT}"
-	dosym "${CLSOURCEROOT}/${PN}/${PN}.asd" "${CLSYSTEMROOT}/${PN}.asd"
-	dosym "${CLSOURCEROOT}/${PN}/asdf-driver.asd" "${CLSYSTEMROOT}/asdf-driver.asd"
-}
diff --git a/dev-lisp/uiop/uiop-3.2.1.ebuild b/dev-lisp/uiop/uiop-3.2.1.ebuild
deleted file mode 100644
index 354fca8768ef..000000000000
--- a/dev-lisp/uiop/uiop-3.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit common-lisp-3
-
-DESCRIPTION="UIOP is a portability layer spun off ASDF3"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/asdf/archives/asdf-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="~dev-lisp/asdf-${PV}"
-
-S="${WORKDIR}/asdf-${PV}/${PN}"
-
-src_install() {
-	insinto "${CLSOURCEROOT}/${PN}"
-	doins -r contrib *.lisp ../version.lisp-expr "${PN}.asd" asdf-driver.asd
-	dodir "${CLSYSTEMROOT}"
-	dosym "${CLSOURCEROOT}/${PN}/${PN}.asd" "${CLSYSTEMROOT}/${PN}.asd"
-	dosym "${CLSOURCEROOT}/${PN}/asdf-driver.asd" "${CLSYSTEMROOT}/asdf-driver.asd"
-}