gentoo resync : 09.03.2018

6 files changed, 71 insertions, 344 deletions

diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index 602bf4cb6ea4..33ad2102a327 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -7,13 +7,8 @@ AUX 2.11/gentoo-changelog-date.patch 803 BLAKE2B 0adbe6e88ef0470d27ffe8ae4e18d86
 AUX 2.15/gentoo-changelog-date.patch 790 BLAKE2B acb85ec980c299eef7bff5f766b0674a38695549f86af8df5d3e87b3fc62943a364fba5e1d87faec251ee9c11ba19ff1dac6ac790a1acd25338fb062ab68269f SHA512 f5dd64feccd905d92743135dec9158e258f3bbae06032ab2059878701d9c308416e355ef2a9d01113df8a4763f4d2ce3d15d42e6ed36470065de079c495ca057
 AUX 70slime-gentoo.el 526 BLAKE2B 6bfd25cf1ef661ac1510d6862d8eea832d1de11d173d7a4c1fc6f12c204c13b641382a23b196c21ad6a4825b620c69244764db65e94060e4b636c5b6702e871c SHA512 94c84b4a91cad91f553c22cc9d61cb6a77aa0dd723571770159237e7d3e6f2ec0e3dc0a3e139a99bd820da67d019891db1e84d384fb96614f086b54e9bd5769e
 AUX swank-loader.lisp 68 BLAKE2B 6cc412c9e0d5357835741486c7c26dd58edaef9d8a4544bf9f3cb416973e76a2e5456d86bf930a66ae60ddbf637523537914fe43a7d5c3793877b194df63ad90 SHA512 2d4c86b5ed9e19268356e6cc97a3693b005f20e40d16a94f4df99953108ce21ee46db6c951218bedb5ec34b086835476424af1ed863989bcd18a9123d03982a7
-DIST slime-2.0_p20101103-patches.tar.bz2 4730 BLAKE2B 536f0953d7bb772a7c020b6b3d43f5096faca94f5f6b507dd1ec18de3d1f6df42b172aec30b1cb7c1ee06034a86bda6d4af246de6ba98321dc0f8fc398b4ad6e SHA512 7990a3ffa4a5867fe84e326034aa794d3396dd2a74125e256be33524e2e737e052094fa11f2f486db34dc619e89e9343d4c5d2f84f3972139c2c7ac33248ce2c
-DIST slime-2.0_p20101103.tar.bz2 725888 BLAKE2B 6ab5ccc40fbe44839a24f2019ba982894932d7c2d0722b4881d0cb39bb0620009ce814026bb1dd85f637ef74f345df06aec456586f3f1d2f3a928c3c7e734825 SHA512 cb0cc3232304ef6efec5e01d3660cc649abb3e5803f17c82785b154b6f0b581889ea3b2dcf261be39b16ff22c912c34c7ec84c400856f5c4a29fbeaf7c49851d
-DIST slime-2.11.tar.gz 1054516 BLAKE2B ca86f2dcf4826fb491cb86321e1ac92cb6c7ffac115a8e6daf7d1ea61e1a6048c1f4cee132f87244a98878414f470d122980bddaf58290f105b8275a7484feb8 SHA512 9507a4460a2f0d5b4f0857824fcaa36f6efeb09aebde7ca682bdc0214b6a722e471180c34ddce26a8f94d7cf3aae959954565ada314729e803d36767afc3e850
-DIST slime-2.12.tar.gz 1057243 BLAKE2B 2b41fbef0fcc0588e56e187e849652a7671186a9dd231ed31c918039a16f1cce2feff20ae570ed02aec79b57e1809635946df85b945a6690232a2f609ee5afca SHA512 f18c79cba3eb75761982f2d1f163aab8213b77fa72a689d110fe91b1aa40953516566adc5f771638eee95d33ba8b4c8842ddf99738804483ccfb76a00290b2a1
 DIST slime-2.15.tar.gz 1072190 BLAKE2B 7623d2d109486e35cb94a3bd8a6b72008c28fbc0bac5bdbcde5fcde19b2ebc74d488a6ff67f026922ea716e67ac732cc72f7b984cc4c2574f57323db93de300c SHA512 15f943981e35995b225b168a3d1c2099f7205c2ff359fa209f164464caf05f9fab4d24906442d94ddeb4222f7116d09a832c7377baf95fbe02d6a98a721fd611
-EBUILD slime-2.0_p20101103.ebuild 2480 BLAKE2B 06f060012843d2c297259ede049db9b3ca5f77cdbc314538feab393d41a53bad8cd8199c70eb160f27d45e79e9931afcf9ed1d2c31f8ec7b3900020c6dc61dfc SHA512 a3e0034f3758b83bd56a90944251e06571e59eda1fd9e0b040372972865720effe46c0f6a56911be705b5e4cabb710d1e6adebb5facb88393ac1c35897fe244f
-EBUILD slime-2.11.ebuild 3830 BLAKE2B 5b9e1a0ebc372006440e83b415e8d041eb2fc65927dae16b9b24d584b2751023ffe2f38daa0c8ce481252158e354ec6609b5153a0e0c3e4e296f07d7164e53c1 SHA512 d6a7a7dfd111983bc323233d16b7b477432a33a45787600ae5e30ae224c087675a9ff3565bf772910947dd0bd83e3e4de7d0421626a77767fc7574de318288a9
-EBUILD slime-2.12.ebuild 3830 BLAKE2B 5b9e1a0ebc372006440e83b415e8d041eb2fc65927dae16b9b24d584b2751023ffe2f38daa0c8ce481252158e354ec6609b5153a0e0c3e4e296f07d7164e53c1 SHA512 d6a7a7dfd111983bc323233d16b7b477432a33a45787600ae5e30ae224c087675a9ff3565bf772910947dd0bd83e3e4de7d0421626a77767fc7574de318288a9
-EBUILD slime-2.15.ebuild 3832 BLAKE2B 475dfcff1d70eaf7a2eb6c7cc6a2e04bef515645c04970bd51daf64c7ea75498b5dab0a80a4470ad543183914b35c35437b7e71bba71050b8f6d6d0506c4957b SHA512 824c1ddb3ad9dc7a8cb0679a824cd654c63e3d43d58697b9719e6ed3e500c1a80ff6fdb1fd2b7e6aca48ce3355d24ac9d78d475c2c1775ce26d3f3707b9b20e8
+DIST slime-2.20.tar.gz 803127 BLAKE2B 9a6e50d50da4c9f8f2226ec919cf7f2068ae93a0bac0301233c2d75f12e94e3345998093880d7836fab07d8541da86de928308cfe571ee5811da6de9bfa11b31 SHA512 994dbffb54ee1ab4ca529771451724c83ff83992a6d495e06cdca5cd94f0c098e48d7914489278e3015f18ea094d58c469e57301492087a33087562f69506b46
+EBUILD slime-2.15.ebuild 3809 BLAKE2B 17727a8c2ed4f026ac4578d6bc3f7631c02108bb7c982da9b06d93033caf352153cd227637f52fbaba9e8093b55ae45b84dd60e0af1efc67cbafb3570f187fd9 SHA512 fc7afdef43a6815f4af457064e8fea8b8b2dc50791efd9956d5b5b2b281bbb8c6554bac454785dc5762f631cc427c0d23add2085c661803f9e8ef655bb6eee79
+EBUILD slime-2.20.ebuild 1716 BLAKE2B 263677e7db9a5431c19f4b254b37909c4f5bb144aee72422257fe6f6bb8ff7c882fef4829a9ffa21898a8894847e42f4d2c07eb4fd705ecafad0741fa5089e41 SHA512 dc0b7b8fc41b0ffe90c1f70104a132f35c2c41ad983a28ac2a52f49f613d39a74a23f5de24b4e0e95f3dcdf7e6920ca5e3dc65222edc1dd8b4ae16be8c51fb21
 MISC metadata.xml 1658 BLAKE2B 8ee9c10524fff6691e0025e7fee60b2fcc92a685dbc55d2abfca2d06591bab471f529e6edd6621d8128a09bd57cab51b73006d951440ea2842312cb5509025a1 SHA512 8147f1f31e699a4de10274a27f8c86427f9245050f2297d11804281f12ed9f7bbc1ae0ca615ffb009e7ce4a57b0c0395e4bc95cc5b043f0e24290660fe65b89a
diff --git a/app-emacs/slime/slime-2.0_p20101103.ebuild b/app-emacs/slime/slime-2.0_p20101103.ebuild
deleted file mode 100644
index 08e07702bc24..000000000000
--- a/app-emacs/slime/slime-2.0_p20101103.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit common-lisp elisp eutils
-
-DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
-HOMEPAGE="http://common-lisp.net/project/slime/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${P}-patches.tar.bz2"
-
-LICENSE="GPL-2 xref? ( xref.lisp )"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc xref"
-
-RDEPEND="virtual/commonlisp
-	dev-lisp/asdf"
-DEPEND="${RDEPEND}
-	doc? ( virtual/texi2dvi )"
-
-CLPACKAGE=swank
-SITEFILE="70${PN}-gentoo.el"
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch
-	mv "${WORKDIR}/swank.asd" "${S}" || die
-
-	# extract date of last update from ChangeLog, bug 233270
-	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
-	[ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
-
-	sed -i '/^section :=/d' doc/Makefile || die
-	sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp || die
-	sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el || die
-	sed -i "s/@itemx INIT-FUNCTION/@item INIT-FUNCTION/" doc/slime.texi \
-		|| die "sed doc/slime.texi failed"
-
-	# Remove xref.lisp (which is non-free) unless USE flag is set
-	use xref || rm -f xref.lisp
-}
-
-src_compile() {
-	elisp-compile *.el || die
-	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
-		elisp-compile contrib/*.el || die
-	emake -j1 -C doc slime.info || die
-
-	if use doc; then
-		VARTEXFONTS="${T}/fonts" emake -j1 -C doc slime.pdf || die
-	fi
-}
-
-src_install() {
-	## install core
-	elisp-install ${PN} *.{el,elc} "${FILESDIR}/swank-loader.lisp" || die
-	sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}/${SITEFILE}" >"${T}/${SITEFILE}" \
-		|| die
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	# remove upstream swank-loader, since it won't be used
-	rm "${S}/swank-loader.lisp"
-
-	insinto "${CLSOURCEROOT%/}/swank"
-	doins *.lisp swank.asd || die
-	dodir "${CLSYSTEMROOT}" || die
-	dosym "${EPREFIX}${CLSOURCEROOT%/}/swank/swank.asd" \
-		"${CLSYSTEMROOT%/}/swank.asd" || die
-
-	## install contribs
-	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo} || die
-	insinto "${CLSOURCEROOT%/}/swank/contrib"
-	doins contrib/*.lisp || die
-
-	## install docs
-	doinfo doc/slime.info || die
-	dodoc README* ChangeLog HACKING NEWS PROBLEMS
-	newdoc contrib/README README.contrib
-	newdoc contrib/ChangeLog ChangeLog.contrib
-	use doc && dodoc doc/slime.pdf
-}
diff --git a/app-emacs/slime/slime-2.11.ebuild b/app-emacs/slime/slime-2.11.ebuild
deleted file mode 100644
index bcab613a5c75..000000000000
--- a/app-emacs/slime/slime-2.11.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-[[ ${PV} = *9999* ]] && GIT_ECLASS="git-r3" || GIT_ECLASS=""
-
-inherit common-lisp-3 ${GIT_ECLASS} elisp eutils
-
-DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
-HOMEPAGE="http://common-lisp.net/project/slime/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2 xref? ( xref.lisp )"
-SLOT="0"
-if [[ ${PV} == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-fi
-IUSE="doc xref"
-RESTRICT=test # tests fail to contact sbcl
-
-RDEPEND="virtual/commonlisp
-		dev-lisp/asdf"
-DEPEND="${RDEPEND}
-		>=sys-apps/texinfo-5.1
-		doc? ( virtual/texi2dvi )"
-
-CLPACKAGE=swank
-CLSYSTEMS=swank
-SITEFILE=70${PN}-gentoo.el
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		EGIT_REPO_URI="https://github.com/slime/slime.git"
-		${GIT_ECLASS}_src_unpack
-	fi
-	elisp_src_unpack
-}
-
-src_prepare() {
-	if [[ "${PV}" == "2.11" ]]; then
-		epatch "${FILESDIR}"/2.11/dont-load-sbcl-pprint.patch
-	fi
-	epatch "${FILESDIR}"/2.0_p20130214/gentoo-module-load.patch
-	epatch "${FILESDIR}"/2.0_p20110617/gentoo-dont-call-init.patch
-	has_version ">=app-editors/emacs-24" && rm -f lib/cl-lib.el
-
-	# extract date of last update from ChangeLog, bug 233270
-	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
-	[ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
-
-	if [[ "${PV}" == "2.11" ]] || [[ "${PV}" == "2.12" ]]; then
-		# SLIME uses the changelog date to make sure that the emacs side and the CL side
-		# are in sync. We hardcode it instead of letting slime determine it at runtime
-		# because ChangeLog doesn't get installed to $EMACSDIR
-		epatch "${FILESDIR}"/2.11/gentoo-changelog-date.patch
-	else
-		epatch "${FILESDIR}"/2.15/gentoo-changelog-date.patch
-	fi
-
-	# When starting slime in emacs, slime looks for ${S}/swank/backend.lisp as
-	# /usr/share/common-lisp/source/swank/swank-backend.lisp
-	pushd swank || die
-	for i in *.lisp
-	do
-		mv ${i} ../swank-${i}
-	done
-	popd
-
-	sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp \
-		|| die "sed swank.lisp failed"
-	sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el \
-		|| die "sed slime.el failed"
-	sed -i "s/@itemx INIT-FUNCTION/@item INIT-FUNCTION/" doc/slime.texi \
-		|| die "sed doc/slime.texi failed"
-
-	# Remove xref.lisp (which is non-free) unless USE flag is set
-	use xref || rm -f xref.lisp
-}
-
-src_compile() {
-	elisp-compile *.el || die
-	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
-		elisp-compile contrib/*.el lib/*.el || die
-	emake -j1 -C doc slime.info || die "Cannot build info docs"
-
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts \
-			emake -j1 -C doc slime.pdf || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	## install core
-	elisp-install ${PN} *.{el,elc} "${FILESDIR}"/swank-loader.lisp \
-		|| die "Cannot install SLIME core"
-	sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}"/2.0_p20110617/${SITEFILE} \
-		>"${T}"/${SITEFILE} || die "sed failed"
-	elisp-site-file-install "${T}"/${SITEFILE} || die
-	cp "${FILESDIR}"/2.0_p20110617/swank.asd "${S}"
-	# remove upstream swank-loader, since it won't be used
-	rm "${S}"/swank-loader.lisp
-	common-lisp-install-sources *.lisp
-	common-lisp-install-asdf swank.asd
-
-	## install contribs
-	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo} \
-		|| die "Cannot install contribs"
-	common-lisp-install-sources contrib/*.lisp
-
-	## install lib
-	elisp-install ${PN}/lib/ lib/*.{el,elc} \
-		|| die "Cannot install libs"
-
-	## install docs
-	dodoc README.md ChangeLog CONTRIBUTING.md NEWS PROBLEMS
-	newdoc contrib/README.md README-contrib.md
-	newdoc contrib/ChangeLog ChangeLog.contrib
-	doinfo doc/slime.info
-	use doc && dodoc doc/*.pdf
-}
diff --git a/app-emacs/slime/slime-2.12.ebuild b/app-emacs/slime/slime-2.12.ebuild
deleted file mode 100644
index bcab613a5c75..000000000000
--- a/app-emacs/slime/slime-2.12.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-[[ ${PV} = *9999* ]] && GIT_ECLASS="git-r3" || GIT_ECLASS=""
-
-inherit common-lisp-3 ${GIT_ECLASS} elisp eutils
-
-DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
-HOMEPAGE="http://common-lisp.net/project/slime/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2 xref? ( xref.lisp )"
-SLOT="0"
-if [[ ${PV} == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-fi
-IUSE="doc xref"
-RESTRICT=test # tests fail to contact sbcl
-
-RDEPEND="virtual/commonlisp
-		dev-lisp/asdf"
-DEPEND="${RDEPEND}
-		>=sys-apps/texinfo-5.1
-		doc? ( virtual/texi2dvi )"
-
-CLPACKAGE=swank
-CLSYSTEMS=swank
-SITEFILE=70${PN}-gentoo.el
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		EGIT_REPO_URI="https://github.com/slime/slime.git"
-		${GIT_ECLASS}_src_unpack
-	fi
-	elisp_src_unpack
-}
-
-src_prepare() {
-	if [[ "${PV}" == "2.11" ]]; then
-		epatch "${FILESDIR}"/2.11/dont-load-sbcl-pprint.patch
-	fi
-	epatch "${FILESDIR}"/2.0_p20130214/gentoo-module-load.patch
-	epatch "${FILESDIR}"/2.0_p20110617/gentoo-dont-call-init.patch
-	has_version ">=app-editors/emacs-24" && rm -f lib/cl-lib.el
-
-	# extract date of last update from ChangeLog, bug 233270
-	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
-	[ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
-
-	if [[ "${PV}" == "2.11" ]] || [[ "${PV}" == "2.12" ]]; then
-		# SLIME uses the changelog date to make sure that the emacs side and the CL side
-		# are in sync. We hardcode it instead of letting slime determine it at runtime
-		# because ChangeLog doesn't get installed to $EMACSDIR
-		epatch "${FILESDIR}"/2.11/gentoo-changelog-date.patch
-	else
-		epatch "${FILESDIR}"/2.15/gentoo-changelog-date.patch
-	fi
-
-	# When starting slime in emacs, slime looks for ${S}/swank/backend.lisp as
-	# /usr/share/common-lisp/source/swank/swank-backend.lisp
-	pushd swank || die
-	for i in *.lisp
-	do
-		mv ${i} ../swank-${i}
-	done
-	popd
-
-	sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp \
-		|| die "sed swank.lisp failed"
-	sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el \
-		|| die "sed slime.el failed"
-	sed -i "s/@itemx INIT-FUNCTION/@item INIT-FUNCTION/" doc/slime.texi \
-		|| die "sed doc/slime.texi failed"
-
-	# Remove xref.lisp (which is non-free) unless USE flag is set
-	use xref || rm -f xref.lisp
-}
-
-src_compile() {
-	elisp-compile *.el || die
-	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
-		elisp-compile contrib/*.el lib/*.el || die
-	emake -j1 -C doc slime.info || die "Cannot build info docs"
-
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts \
-			emake -j1 -C doc slime.pdf || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	## install core
-	elisp-install ${PN} *.{el,elc} "${FILESDIR}"/swank-loader.lisp \
-		|| die "Cannot install SLIME core"
-	sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}"/2.0_p20110617/${SITEFILE} \
-		>"${T}"/${SITEFILE} || die "sed failed"
-	elisp-site-file-install "${T}"/${SITEFILE} || die
-	cp "${FILESDIR}"/2.0_p20110617/swank.asd "${S}"
-	# remove upstream swank-loader, since it won't be used
-	rm "${S}"/swank-loader.lisp
-	common-lisp-install-sources *.lisp
-	common-lisp-install-asdf swank.asd
-
-	## install contribs
-	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo} \
-		|| die "Cannot install contribs"
-	common-lisp-install-sources contrib/*.lisp
-
-	## install lib
-	elisp-install ${PN}/lib/ lib/*.{el,elc} \
-		|| die "Cannot install libs"
-
-	## install docs
-	dodoc README.md ChangeLog CONTRIBUTING.md NEWS PROBLEMS
-	newdoc contrib/README.md README-contrib.md
-	newdoc contrib/ChangeLog ChangeLog.contrib
-	doinfo doc/slime.info
-	use doc && dodoc doc/*.pdf
-}
diff --git a/app-emacs/slime/slime-2.15.ebuild b/app-emacs/slime/slime-2.15.ebuild
index 367f357aff3f..26d86bd44bde 100644
--- a/app-emacs/slime/slime-2.15.ebuild
+++ b/app-emacs/slime/slime-2.15.ebuild
@@ -15,10 +15,8 @@ fi
 
 LICENSE="GPL-2 xref? ( xref.lisp )"
 SLOT="0"
-if [[ ${PV} == *9999* ]]; then
-	KEYWORDS="x86"
-else
-	KEYWORDS="~amd64 ~ppc ~sparc x86"
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="amd64 ppc ~sparc x86"
 fi
 IUSE="doc xref"
 RESTRICT=test # tests fail to contact sbcl
diff --git a/app-emacs/slime/slime-2.20.ebuild b/app-emacs/slime/slime-2.20.ebuild
new file mode 100644
index 000000000000..b8a5bdb9d7fa
--- /dev/null
+++ b/app-emacs/slime/slime-2.20.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp eutils
+
+DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
+HOMEPAGE="http://common-lisp.net/project/slime/"
+SRC_URI="https://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 xref? ( xref.lisp )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc xref"
+RESTRICT=test # tests fail to contact sbcl
+
+RDEPEND="virtual/commonlisp
+	dev-lisp/asdf"
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-5.1
+	doc? ( virtual/texi2dvi )"
+
+CLPACKAGE=swank
+CLSYSTEMS=swank
+SITEFILE=70${PN}-gentoo.el
+
+src_prepare() {
+	# Remove xref.lisp (which is non-free) unless USE flag is set
+	use xref || rm -f xref.lisp
+	eapply_user
+}
+
+src_compile() {
+	elisp-compile *.el || die
+	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
+		elisp-compile contrib/*.el lib/*.el || die
+	emake -j1 -C doc slime.info || die "Cannot build info docs"
+
+	#if use doc; then
+	#	VARTEXFONTS="${T}"/fonts \
+	#		emake -j1 -C doc slime.pdf || die "emake doc failed"
+	#fi
+}
+
+src_install() {
+	## install core
+	elisp-install ${PN} *.{el,elc,lisp} || die "Cannot install SLIME core"
+
+	## install contribs
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo} \
+		|| die "Cannot install contribs"
+
+	## install lib
+	elisp-install ${PN}/lib/ lib/*.{el,elc} || die "Cannot install libs"
+
+	## install swank
+	elisp-install ${PN}/swank/ swank/*.lisp || die "Cannot install swank"
+
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	## install docs
+	dodoc README.md CONTRIBUTING.md NEWS PROBLEMS
+	newdoc contrib/README.md README-contrib.md
+	doinfo doc/slime.info
+	use doc && dodoc doc/*.pdf
+}