Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

13 files changed, 5 insertions, 226 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index dd8da50a4b1a..04b9de92e421 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/edit-server/Manifest b/app-emacs/edit-server/Manifest
deleted file mode 100644
index f4186c61864a..000000000000
--- a/app-emacs/edit-server/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 50edit-server-gentoo.el 109 BLAKE2B d2031df0e4749d59b84ea1d5d591345e53a850476865b3c3015debe7af8e9e07fb8827974c8eafd160ce19256a720190175822d72894e2365f19d6e141e2241b SHA512 cefe2c20f415d9f5f8e1dbb31bfca213f9ccb50d84d472770fd5833cac2885eaa0fa203802075dd4dcd822729173decf580508f504124e93578043f0384bc775
-DIST emacs_chrome-1.15.tar.gz 315059 BLAKE2B 12aee8ddabcaa2c843c6315e510f757a54495affcbdccc315199270270905b3c25409f6a0aee859e0d835e16f0c8c6dab18ee147cd82864d49a6f4e4942fb99e SHA512 c91c6785d92607b2e7f6bba20176048fe8893ac7e672d860ba3befc910825bbae478104b7ba53cd8253a4f354eb26bc0a993f23fed5888c3b8c9cdf00e116c30
-EBUILD edit-server-1.15.ebuild 542 BLAKE2B 3933284076b468bfe8b0feb235ab99dfd19aa3ad4aa28529d73b5d5f617776bb8da3457aed8a09e77a9e05931b04d4329d205a473b1c6ecb7f4979e998159946 SHA512 ed87f8e02c271c1a1007ae0bd8aa878cc41095d4fbc2367a2b2e1f5da5de426bd534c94df8f73979b1997e6ece53b34ec84de1ca70864443074a1d3b744fc310
-MISC metadata.xml 760 BLAKE2B 0f9b83c637e2b5b541c14fa180f08344e5508796bb7b445ba0735677520c92207647b910e7fe3421733acdc2e1bb01c844f501ceb29a128920f09da73526c00f SHA512 c9f7c91eb399b5b3072e7a20d9f0813eef71f6a08650e18fd4b171f39c6d991e2a4a573710406f17b1f8703b76d36c9bd2e6e36c4a730f8583f51983bc5971c3
diff --git a/app-emacs/edit-server/edit-server-1.15.ebuild b/app-emacs/edit-server/edit-server-1.15.ebuild
deleted file mode 100644
index 50ca006ea9ec..000000000000
--- a/app-emacs/edit-server/edit-server-1.15.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-MY_PN="emacs_chrome"
-DESCRIPTION="Service edit requests from a web browser for editing of textareas"
-HOMEPAGE="https://github.com/stsquad/emacs_chrome"
-SRC_URI="https://github.com/stsquad/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}/servers"
-ELISP_REMOVE="edit-server-ert.el"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README"
diff --git a/app-emacs/edit-server/files/50edit-server-gentoo.el b/app-emacs/edit-server/files/50edit-server-gentoo.el
deleted file mode 100644
index 42beafcc3e99..000000000000
--- a/app-emacs/edit-server/files/50edit-server-gentoo.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'edit-server-start "edit-server" "Start the edit server." t)
diff --git a/app-emacs/edit-server/metadata.xml b/app-emacs/edit-server/metadata.xml
deleted file mode 100644
index 8e8d8067eae2..000000000000
--- a/app-emacs/edit-server/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<longdescription>
-  Edit with Emacs is an addon for webextension compatible browsers
-  like Google's Chrome(ium), Opera or Firefox that allows you to edit
-  text areas on your browser in a more full featured editor. It does
-  this in conjunction with an "Edit Server" which services requests by
-  the browser. This is because extensions cannot spawn new processes
-  as a security measure. 
-
-  The extension packages a native elisp version that can be run inside
-  GNU Emacs itself.
-</longdescription>
-</pkgmetadata>
diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest
index 03ac324a235c..9cd1bd84a6e5 100644
--- a/app-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@@ -1,8 +1,6 @@
 AUX 70emacs-w3m-gentoo.el 96 BLAKE2B 90d452df120d37b1d19be08ed6e7b56edb588c95de6d124bdb8d25daa5c65fd8a19500e29e94a0936aa8efa2b51bae258e1431c6d1459d0d700e8d1dae0cbaca SHA512 7fd090a575e5b8f2df50bd751f301f5f4409dfd78eb45bb911c54a3cbfe76941a146630ea0e4089138c400caf45bb040f72e3ac335457061776e01e0aa3f5577
 DIST emacs-w3m-1.4.528_pre20140213.tar.xz 751532 BLAKE2B 14527b80ed3938f2685a98cf37633a9ba046b070d94dffd7c8082d65c09dfca4a63114aff55d0bfe85853d8623db55dd63db3e7d10142871287312281fa4ef59 SHA512 f4ccb41f2011354c091c9b07b2ab596f030a6b2e8ef2ef674db75c93e5bfe7347b8b3602283e169e7fd591c44b222482d1a399880c60176fc55a5e77ed728483
 DIST emacs-w3m-1.4.570_pre20170203.tar.xz 765108 BLAKE2B 75568e543719a25863ee943293f1a6ca4fff8b5af19a39d910efe5a8bfa7f311ef3620c34a6fcfe23e231e33d61c9ba5a03cf39b23155982079a0cf28471a341 SHA512 d1940679055d7ad74b7c417dc9e56061524f5afdf758075139e279c2df325af10eae334a6b83d40d39857237396da04744f19c293ffb8adb2e579c32ed118b52
-DIST emacs-w3m-1.4.625_pre20180518.tar.xz 788404 BLAKE2B f621071c8657cab848789d359d492e5bee0fe401af48871fa54298571d87192de7186b1ea92fd3d64e6f1713fd12e5750b49b7e54c94e8d3b455d614ef0d0683 SHA512 f60317024f6dca23699510c21f185c162a5b3f0be551c681ce69b3b46e6fc7860e875fa6fc46a0bfafd8e5e6aaa9f1b29af0e0731685fbca2ce2b636eca7ad93
 EBUILD emacs-w3m-1.4.528_pre20140213.ebuild 1120 BLAKE2B e136c6089f6e29092c17f09ff36199e081eb6cc28c7ef276ce6781aaf02e503271988664192628db8a7c8532c9f9c6bb09b67f488cae444166f097c2025d63b3 SHA512 270d48daafef67a4da1fe7d7a3f362c27732a59396bc4b845ba6d1be7f0e8865954b478042404efcdebf2ef0a2cfa390f3a13fe9906255f9bb2b2ea0954b2b8f
 EBUILD emacs-w3m-1.4.570_pre20170203.ebuild 1215 BLAKE2B 98cc7be2a22dab4a69444df06d37ece302e3b8211e80060c27a9ba0c425af7af5b53f9ce224bb3d3cd13be8995ec4f16ccf3717b50efac71199bbc8e55f7e8bf SHA512 9ec23005c602a2879d7ca26c7f44d67efa9663ee8d9d7c346aefd2b374166608bb6cef7d1d23d43c2ee295fc5420681ff63f74a6b8d0b007a83d9cc2c26cb3de
-EBUILD emacs-w3m-1.4.625_pre20180518.ebuild 1215 BLAKE2B 98cc7be2a22dab4a69444df06d37ece302e3b8211e80060c27a9ba0c425af7af5b53f9ce224bb3d3cd13be8995ec4f16ccf3717b50efac71199bbc8e55f7e8bf SHA512 9ec23005c602a2879d7ca26c7f44d67efa9663ee8d9d7c346aefd2b374166608bb6cef7d1d23d43c2ee295fc5420681ff63f74a6b8d0b007a83d9cc2c26cb3de
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild
deleted file mode 100644
index cfd2bfcc7f22..000000000000
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp autotools readme.gentoo-r1
-
-DESCRIPTION="emacs-w3m is an interface program of w3m on Emacs"
-HOMEPAGE="http://emacs-w3m.namazu.org/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="l10n_ja"
-
-DEPEND="virtual/w3m"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-SITEFILE="70${PN}-gentoo.el"
-
-src_prepare() {
-	mv configure.{in,ac} || die
-	sed -i -e '/^configure:/,+2d' Makefile.in || die
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	default
-}
-
-src_compile() {
-	emake all-en $(use l10n_ja && echo all-ja)
-}
-
-src_install() {
-	emake lispdir="${ED}${SITELISP}/${PN}" \
-		infodir="${ED}/usr/share/info" \
-		ICONDIR="${ED}${SITEETC}/${PN}" \
-		install-en $(use l10n_ja && echo install-ja) install-icons
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	dodoc ChangeLog* NEWS README
-	use l10n_ja && dodoc BUGS.ja NEWS.ja README.ja
-
-	DOC_CONTENTS="If you want to use the shimbun library, please emerge
-		app-emacs/apel and app-emacs/flim."
-	readme.gentoo_create_doc
-}
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index 4651406ae60c..fa18414c2875 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -1,7 +1,7 @@
 AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58ac6e3f7cc44c68a16d49c9156cf37285778a38bf97a1f4805a22d6d5cf9d597acdcdedfd77c62a5825a0d1d88f SHA512 200da398adf72241112bcda74b432a8a313cf29018c9f6fbdf6021674b23a201ada6ba884d4c9c3a4ee4c042d6c8fc7c3ba59702c8ddb6ea20b652f9ded9d32f
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
-DIST eselect-1.4.13.tar.xz 177848 BLAKE2B 70e5a793759e16119f5233b2c974e0fcc8d213b2033e2b3b76e0a047797b1a0f2feb21ad3beda72f644b498725b4d8ff5c221dcd0870adf5197eaf81c6f3c895 SHA512 5ce10bd288268bc5b52031703f8ac8f3cf07bb22039339bb00c92583ed226162ea8865788f5c1ff4e058d38f0bf25e3557273fb1e839e0391c1fafb9f702bc11
+DIST eselect-1.4.4.tar.xz 177536 BLAKE2B 9991d69a0589be0a7df881fe5d6c0021c99fd7fd5b561ad7a9423edc46b25528b499a3e839dfe974d5d53e8e8a5b3a798cd7f5f1eeb78e531fff16680babce96 SHA512 1ed01cf00e3f13aad3e5f844c7086c3dd48398efd76e68cd91cf13b9939f4b48eef8915c5f3926954d158023115ad66ee67c0bc8fc4c9570900a37207674fc8f
 EBUILD eselect-mode-1.4.12.ebuild 573 BLAKE2B 49644f3440da18f4cbf22d6681edca141578776cb899cf25b888200eb99ff0b9068919e24d6c86c46ca41005763a94f951d598a5916f78949fbb99bbf830f622 SHA512 f4a8c484fb16d0408abeb8e269a034b71046cfdb2686462c5c7e64cce27f03ad71f6172cbf4fb0fbb9e91eb7ebed73f196d68de04bb26d7a4aed3644777a850c
-EBUILD eselect-mode-1.4.13.ebuild 585 BLAKE2B 95b276e93a07acf68a05fc66a0856cf1254075a2a3280a1b22c4f5ec56ddbf366efff50295bb6d7355aa14fdb95c30f7e3da5126eff96edf03647dc744805e73 SHA512 5f3dda333a11bfae3afd5e4377f5f3ab74d11be4690035ed2aaefcd47bfc00b7363d560117e256c41539ab8cc98894c9b642347b7302673e55776a97cbb29c56
+EBUILD eselect-mode-1.4.4.ebuild 570 BLAKE2B fb18e59ec9ba157d1a8f6b55e9e416b4332c9cc7cf561b782361ff4c840881696cf0e91b2f63f9da223fb2a3d06dae3fe3f6d46678b7139ddca745d676e718f0 SHA512 14ab8292c91ab1da794cfd4b33b09dec3f382c1e7fbf3ed3f9fc0f26438ae255b314f993963cc867e37f6cfcba37d8da0f64e6094cb42fb13ca8f11b9ed1675e
 EBUILD eselect-mode-9999.ebuild 458 BLAKE2B 0a5b748fc09dbfe532ec9b40adbbb939bd5150ecac9ee610ad0dc5b37e7b6ccdcb8c183337d6f0ce04ee5bfad4f1ede0c13cc4dc55c828474b07265fd91ffba3 SHA512 5d11532145273d6956274ce05d732352593a20daa1d86f900b1fa9927aa536131e5ec922996f4e3939803253e5649f6c2a3ec9a81dabd6dac0475422cf0a4ceb
 MISC metadata.xml 426 BLAKE2B 85331f7b7beb7a72e8151728884637e255f783856cabaf1a6bf58938b4a3f565eaa047dad4032089c416381c52d66f4341805cb43f152f99c83d0c27900f8963 SHA512 18468ec99892972ddfd973e3efc4869abc9848906773556b6ae5bf9bc48780c790beb77da548c98f9fc07771068dc219d1af2f3dc29f1bb36f12dddd2432a675
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild
index 349169b3ecde..cbc16c8b03ab 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=5
 
 inherit elisp
 
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/haskell-mode/Manifest b/app-emacs/haskell-mode/Manifest
index 39bbd4e1d29c..d3ba1a41f9df 100644
--- a/app-emacs/haskell-mode/Manifest
+++ b/app-emacs/haskell-mode/Manifest
@@ -1,8 +1,6 @@
 AUX 50haskell-mode-gentoo.el 44 BLAKE2B 1587be01b819c8d788bc8b9c3e9481885b2be3ceda43336f8d8728f245c961cb49aa6b1245558ce4d25ed28fcfc310c4fa95f992335ca75b6cdff90e33f18af0 SHA512 3a4dc946f9f5b5e7dfed41d19b8e576f3d164d81049b7bcad08791803116104f0450634569ee60a65f78e42b2153b925062b05f31cf8b5477160a73eadbfcf2a
 DIST haskell-mode-13.07.tar.gz 131102 BLAKE2B 402a4f21eb400c0f20a17b37c556b2f3eb949ef7fe38ffc2a0f7384ef252da9f69a6ab405ab782ab9739d2b2e57bab5c471c840cc8c3e4db7b42082f8e5bb428 SHA512 e19d55a99f4d9a571c1ed0b095254e4d1b8080d9ba671461aa228cbf8aa7c7a213e19e588c0f69450a1bd4ac25793b523415a6f11bfb5dda7706dc35f7beee68
-DIST haskell-mode-16.1.tar.gz 1192866 BLAKE2B 5a53075be5ea1246f2aa61d1004fb282d6c5e182497f7660336cf89634bde3b6455997286a4e7e599bf044a9d5c47384f44addb1ab6f53a257c749a93849992e SHA512 28654499ee521032be1ae6edfd338cab6022d7fdd4ff34e720ffe249801d4b442484cce4f5fc3461aa5145918f66f4b69df774b60cceb408220fc0533386cc56
 DIST haskell-mode-2.9.1.tar.gz 123579 BLAKE2B f6aa2d989961868d2de5815ccfe79fbc75902ca33572a799e4967047685fe8d598aa3057d655ed0006c5d814e706ee94e6460c702d4bf88ba253acd0187e0970 SHA512 7c4cbdfd0f9e43ab3efd39c8ca7fcd941538865fe41522703175b7ca8a67276945ef7feef4207fa66aee156a028cb52bb96593867db0c777baba9f59415ee979
 EBUILD haskell-mode-13.07.ebuild 1163 BLAKE2B cf11607be57dc65c16bd9519ffd7f97aa359eec9d657c5325fc09c522f33f7448fffa50da56bbbc1fe17836e43e55157e4da9101062ae6f9ba714fb82f84bec9 SHA512 a3bf4975f672f62835ae80f600b1dea83e1480d05d0a56e0261ab97c9b6d0417ceef923a142fd23087038e547b4ed8f2d21cf59151a26ec74d6b94f1051fbc71
-EBUILD haskell-mode-16.1.ebuild 1050 BLAKE2B b0667cb95a16e9ee94d527002e32ad3877612d95bd3b3ac2f73f6e3693e7ec6bdd29458745d63722e6d9c529ab1ada959b9d733234fb996deae3de778d8cabb1 SHA512 08eae466b741962a41ae17d23f04dbfe1aa327659e901b757741ce721bedd486d76a33d12a45c56d95af749ca1c9d43dc11bba474be4b95ff4aba7566fce9680
 EBUILD haskell-mode-2.9.1.ebuild 1025 BLAKE2B de3b65e493a238f45a2872fa721f288d0639b67f36fa8ea85906fcdd2c787a7e4bca5d3b2fccdb36cf80dfeb8e1cb181ef8f8db378d7407a0749e78dc5aaf462 SHA512 3ba4e5d481325c864c1add293cb9a1c8d9e7e42360760f857666aae90fcc9b6aa4afc03b76ada8dcd32652b517ed0d2736e68e8b4c2f3545fa1ff556c1acae3f
 MISC metadata.xml 342 BLAKE2B d6d9c7ef2031356fd8b6e98dbcfc34af7188474748b74b4785b21865e893eabf1c9dc596caabc2b79975dcccef596bc1548cb6c2631557f8bd3db54d72d1b712 SHA512 27d23d8c193524aa83dd02d17e9161d5eaa5282bb810498b4a010a7d68800688a8ecefd66d9979ed9f0ad3206f255edd923723357a366b97ffe07e2b18206147
diff --git a/app-emacs/haskell-mode/haskell-mode-16.1.ebuild b/app-emacs/haskell-mode/haskell-mode-16.1.ebuild
deleted file mode 100644
index a8d61e5c904d..000000000000
--- a/app-emacs/haskell-mode/haskell-mode-16.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Mode for editing (and running) Haskell programs in Emacs"
-HOMEPAGE="https://haskell.github.io/haskell-mode/
-	https://www.haskell.org/haskellwiki/Emacs#Haskell-mode"
-SRC_URI="https://github.com/haskell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="sys-apps/texinfo"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="doc/haskell-mode.texi"
-DOCS="NEWS README.md"
-
-src_prepare() {
-	# We install the logo in SITEETC, not in SITELISP
-	# https://github.com/haskell/haskell-mode/issues/102
-	sed -i -e "/defconst haskell-process-logo/{n;" \
-		-e "s:(.*\"\\(.*\\)\".*):\"${SITEETC}/${PN}/\\1\":}" \
-		haskell-process.el || die
-
-	eapply_user
-}
-
-src_compile() {
-	elisp_src_compile
-	elisp-make-autoload-file haskell-site-file.el
-}
-
-src_test() {
-	emake check-ert
-}
-
-src_install() {
-	elisp_src_install
-	insinto "${SITEETC}/${PN}"
-	doins logo.svg
-}
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index 676058a43bff..cfbc05e6004a 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -11,6 +11,5 @@ AUX swank-loader.lisp 68 BLAKE2B 6cc412c9e0d5357835741486c7c26dd58edaef9d8a4544b
 DIST slime-2.15.tar.gz 1072190 BLAKE2B 7623d2d109486e35cb94a3bd8a6b72008c28fbc0bac5bdbcde5fcde19b2ebc74d488a6ff67f026922ea716e67ac732cc72f7b984cc4c2574f57323db93de300c SHA512 15f943981e35995b225b168a3d1c2099f7205c2ff359fa209f164464caf05f9fab4d24906442d94ddeb4222f7116d09a832c7377baf95fbe02d6a98a721fd611
 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-r1.ebuild 1832 BLAKE2B 616eda3d92ec1710f26de61e05bbea0b88fd2c3b3e1587a1511ed9fba75b16b544728d018c789219d1ef8223f57aa4b1664b25a4a3502d2c3dae0640139e20d2 SHA512 26fdca6c0d661219ec94e112e21ca4688915da1a3f33d7ec2f8e8cb7fbc99766518b16021c6a0f1d5c305823ff94472c44b24a53dd8758b43aae3f4afce00245
 EBUILD slime-2.20.ebuild 1740 BLAKE2B d762c6475376871762197c2f2c3aa8a4800991cebc67467c6696b96f6bc6e370f9a5f65d1479dae0e522a97f62e3533a4a72228dd724c9e58f50278ed5906dcc SHA512 793859aa3874accd77810f27ec116a9e52c82d88d77c9b86212422b4084cc6a28cb7a99744a9fd0244519a8e2f60621afea059cbb2e1425ab5126a61cf9dcbf2
 MISC metadata.xml 1658 BLAKE2B 8ee9c10524fff6691e0025e7fee60b2fcc92a685dbc55d2abfca2d06591bab471f529e6edd6621d8128a09bd57cab51b73006d951440ea2842312cb5509025a1 SHA512 8147f1f31e699a4de10274a27f8c86427f9245050f2297d11804281f12ed9f7bbc1ae0ca615ffb009e7ce4a57b0c0395e4bc95cc5b043f0e24290660fe65b89a
diff --git a/app-emacs/slime/slime-2.20-r1.ebuild b/app-emacs/slime/slime-2.20-r1.ebuild
deleted file mode 100644
index 8c79ae0d45c3..000000000000
--- a/app-emacs/slime/slime-2.20-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-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
-
-PATCHES=(
-	# Should be fixed in >=app-emacs/slime-2.20
-	"${FILESDIR}/${PN}-2.20-fix-doc-build.patch"
-)
-
-src_prepare() {
-	default
-	# 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 -C doc slime.info || die
-	if use doc ; then
-		VARTEXFONTS="${T}"/fonts \
-			emake -C doc all
-	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 "Cannon install site file"
-	# 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
-
-	# Bug #656760
-	touch "${ED}${SITELISP}/${PN}/lib/.nosearch" || die
-}