gentoo resync : 09.03.2018

15 files changed, 105 insertions, 484 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 43804c41d88b..df98f6294c50 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index e98b637051e3..129c37254cb6 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,9 +1,7 @@
 AUX 50ebuild-mode-gentoo-1.31.el 649 BLAKE2B 47fbea3bd7d02a90b66c21577eb4e4c1b7a6083abab29ad57b3bd92c347fb11d3aa509c1d8dc43e37b8e8ac9a7414e1325951e5a72e998d5b7937bb07334fffa SHA512 59c1ca3ce148d037d16b06cfb5de56cefb608c514f942f9dbbdd8655ae65b438cc04d395647def321d85d7685a5f8ec5e5cf487edf9a5074d7972f489e8eafc2
 AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f923c2be4090fe8635fa85d338af3d170b1ad3d6b2f31704cf24e1528d3ce9b6fd3d305c2e3c1b1923e345e011642307 SHA512 8038b7bac0f3322b1149467152790dac7cd133234afe7c362c0e14686e378bc27eaf432a7194e1748dda80b41483943facb44e1a66466ebdcb4e7a0768e8f629
 DIST ebuild-mode-1.38.tar.xz 30744 BLAKE2B a147fbb462f0e1a2ba3272c74b12c9357200b0ca6671d75263547d7b777489772504c9fda634a797fecff8dce35e40b7bb579cdbd9a7da99f68f74b08a48a4da SHA512 bfcc4fb100f7d9299e9b466c7661e865f9b93ee352780da1647f1a98159fe3e9eeb8cd4b7d1d9906d532316d1256ec7b6f821cac3d064cda15f2fd62ca7cb349
-DIST ebuild-mode-1.41.tar.xz 34728 BLAKE2B c3863a249536c7df1ee4463879fb29a3b7243eee7192319ffeff527f40527891e02e9dec69601a1783a7ed28fa098b102b224eb5cdd5e9c95dcca37d48acc4a2 SHA512 8c85b8c5197162c936cbb4d8d204eb10e4f20d413b021c4b4d7b18793cef192063ea74441efa6ac69ec91e2297344027a0ea714537898cfa41ad8fd5a1262bce
 DIST ebuild-mode-1.42.tar.xz 34936 BLAKE2B dd94d17dc57e2d32b329ab62ec6eec8ada6a4aeddadb8d978736f5dcb4d613759fd860043cab92d12db11614f8b7fa71fc5537576a2af3f5e6c9d56fc2fdcc05 SHA512 119f954eaf009bd0c9f0a75810b94a54d65ed91c6ffef20dd164c7a5ef095410dd0f3642426817f5efa6623d4f3e120ed3b27076222b02a90e75a83bb80b8703
 EBUILD ebuild-mode-1.38.ebuild 587 BLAKE2B 01bab3a0519d1fe60b3eb52cfcb8de2d56fe7a8ab0eca2a4189c9c498e74fc025833cb2fe53095f859ab3ab82221ca6de61ba5037c5f5e5f4b0f72f333947ee5 SHA512 cc893036f642763ae299d5b276aac11f0e7fd26559cff449b7e2964d9b58c8b03334a24b8702969609acfc59ae96944104f0b923449951ab953ead744ef52757
-EBUILD ebuild-mode-1.41.ebuild 596 BLAKE2B 2a9d8934a2aa7e5b4ab7e55cade168df46455ab7f369b1c1c6c9650e1e515ea7424e4620bb0ecb2bf2514e0d37019d98bd02f8c5631f9a3601bca026c954e0e6 SHA512 a27d88e857c8d0403f5e6a67f707f4e4b0c822c87622905cedf9f31a1b80a9c6cf8b14839fd96304db61ae213c93e2781fef8ae1cc5bd33f39833ec59a5f296e
-EBUILD ebuild-mode-1.42.ebuild 741 BLAKE2B 582b446f319a573951dc4a8af8b3fea1e84d1d9d38dd2733677fc979310a1900f9da8721e0708918f4fdb6e09e2f437cb9b51bf107a296a77c3c4c1746e23ace SHA512 fe1840e1e1c6d4a061143e040072ab0d32246d2af0fe45bf55069ad231a77777db3f438c35d9fc9d39ea904f776c4e4da26109277e8209a6b19ddd493a0103be
+EBUILD ebuild-mode-1.42.ebuild 737 BLAKE2B a4aaea39292f0cd32690b22d2b2823522fa10cfd17c8115b08e65eaea5110136ec3cc79c109e3bbfd862197c39c85356193056c68046974dd440de7659d1083b SHA512 e8b8d42084d2816d694e0cb592ce734a22d9a2cd7e4027b149977b8692c6ab34642e15624a410e4f2fd0066a443c7915e75cb9180a899db6c13743c04b93cd43
 MISC metadata.xml 403 BLAKE2B b3996463afa7f1471fafe74467cc3b2bfac32c9ed6f8cbab1390ac1b974be057982f8f3ec7d796f7eb45b023d702b668f979e962d6c33c525f1e644de2703007 SHA512 b6c2ed67a0eac9b03f15bc00374f925eb8ba28000f8d1ebbe03f75e26c953ef799fe73c0bc1658089e5ab687cb07e97ff8d74123b6a67cd5dd8246e81051c239
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.41.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.41.ebuild
deleted file mode 100644
index 86ddef74c60a..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.41.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-DEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.39.el"
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
index 65d3a156213f..43c6b1b88a0b 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 167aa6fe2dba..9372090b8b9b 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,4 +1,3 @@
 DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
-EBUILD emacs-common-gentoo-1.6-r1.ebuild 2887 BLAKE2B cbbc4e8f0ef4e20dea5e990e55fd555061d81b8842b56d8122369f1eaf98588c16bff9d49ade3d9508d7a72ee23ea42b9d17aae3d1a1cde4e06d74b733c82859 SHA512 8dec173d096f8a6d654cfd964b04a31b3a48bd47037bba82c328cecae0ed3efceac2833f52b89d686a823f188e44427be27108e037a29f137ee941d702fe21dd
-EBUILD emacs-common-gentoo-1.6.ebuild 3150 BLAKE2B e98543f1db21c3f9aba5bf02e3363c2e935ab2b4b829d07abc77a39e1660b6da55c2d3ea2d1e6f0ea810bf443ffc50476a4a69b40f3be98e1a5cc280af36c96e SHA512 690be3a0a5daf9ba2d812e36db2be905c53d292e4cc9f8cefb9d31b03e49961b68603ee8ae1a3cb4e230697825dd2c3f40b3e2ab9c92f21f6a1984b34e4d1af1
+EBUILD emacs-common-gentoo-1.6-r1.ebuild 2881 BLAKE2B a0ea2ea78f87e85ab93c384e3b907ff1e83e88475963e234285d7f2e4ff3151f2216a987c5e826bb9ada3e7283f1777f99fe8349e2905e5c3c28aa33980af0ec SHA512 66e6abf850ffce638f54e93442840e787932614f7b2424adeb70034a134d2fd548284a0093bd5c90a20aaaa010f84d9d34bb8ba5706901932fbfdb022d71bbab
 MISC metadata.xml 337 BLAKE2B 4eb067768aa32943a1e7c0cf4fe8444a64c41b05ce7397d088a2f38d60fc2a484d7df5d8b78761a836d647ad005babc7ee8404ea112f7884b8918863eea2b8c4 SHA512 4fca91d99b7d069ef8a7b1ca182f8eef738817b3ee9a2540549642f21574fefc70eee2f3e0e000c3ee860983a651470b5aecf1e126b2cc7465defd708e608ebd
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
index 5aa9b9586051..cd5609e84a74 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-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 ~sparc-solaris ~x86-solaris"
+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 ~sparc-solaris ~x86-solaris"
 IUSE="games X"
 
 PDEPEND="virtual/emacs"
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6.ebuild
deleted file mode 100644
index e795561fea8c..000000000000
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp-common eutils fdo-mime gnome2-utils readme.gentoo-r1 user
-
-DESCRIPTION="Common files needed by all GNU Emacs versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-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 ~sparc-solaris ~x86-solaris"
-IUSE="games X"
-
-PDEPEND="virtual/emacs"
-
-pkg_setup() {
-	use games && enewgroup gamestat 36
-}
-
-src_install() {
-	insinto "${SITELISP}"
-	doins subdirs.el
-	newins site-gentoo.el{,.orig}
-
-	keepdir /etc/emacs
-	insinto /etc/emacs
-	doins site-start.el
-
-	if use games; then
-		keepdir /var/games/emacs
-		fowners 0:gamestat /var/games/emacs
-		fperms g+w /var/games/emacs
-	fi
-
-	if use X; then
-		local i
-		domenu emacs.desktop emacsclient.desktop || die
-
-		pushd icons || die
-		newicon sink.png emacs-sink.png
-		newicon emacs25_48.png emacs.png
-		for i in 16 24 32 48 128; do
-			[[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
-			newicon -s ${i} emacs23_${i}.png emacs23.png
-			newicon -s ${i} emacs25_${i}.png emacs.png
-		done
-		doicon -s scalable emacs23.svg
-		newicon -s scalable emacs25.svg emacs.svg
-		popd
-
-		gnome2_icon_savelist
-	fi
-
-	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
-		added to ${SITELISP}/site-gentoo.el. In order for this site
-		initialisation to be loaded for all users automatically, a default
-		site startup file /etc/emacs/site-start.el is installed. You are
-		responsible for maintenance of this file.
-		\n\nAlternatively, individual users can add the following command:
-		\n\n(require 'site-gentoo)
-		\n\nto their ~/.emacs initialisation files, or, for greater
-		flexibility, users may load single package-specific initialisation
-		files from the ${SITELISP}/site-gentoo.d/ directory."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# make sure that site-gentoo.el exists since site-start.el requires it
-	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
-		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
-	fi
-	if [[ -d ${EROOT}${SITELISP} ]]; then
-		elisp-site-regen
-		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
-	fi
-
-	if use games; then
-		local f
-		for f in /var/games/emacs/{snake,tetris}-scores; do
-			if [[ -e ${EROOT}${f} ]]; then
-				cp "${EROOT}${f}" "${ED}${f}" || die
-			fi
-			touch "${ED}${f}" || die
-			chgrp gamestat "${ED}${f}" || die
-			chmod g+w "${ED}${f}" || die
-		done
-
-		if has 1.4-r1 ${REPLACING_VERSIONS} \
-				&& [[ -d ${EROOT}/var/games/emacs ]]; then
-			elog "Updating owner and permissions of score file directory."
-			chown 0:gamestat "${EROOT}"/var/games/emacs || die
-			chmod 775 "${EROOT}"/var/games/emacs || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use X; then
-		fdo-mime_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	if use X; then
-		fdo-mime_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-emacs/rust-mode/Manifest b/app-emacs/rust-mode/Manifest
index 604eab207589..df4a1980c73e 100644
--- a/app-emacs/rust-mode/Manifest
+++ b/app-emacs/rust-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50rust-mode-gentoo.el 135 BLAKE2B 083a273140a659c1a76c05178990ffe4b0f3ae2ede81878ce8cfaab451df4a5169cea46fa4600e57ea77a9a7d55571cb7c862098e5ee76677dd73213e6a30036 SHA512 bd6f7579408d26900d40e674ff75bac2d1989c9bd068dae4bd4c54271e7b04cfcdf4d7d3622955f949cb60496a0d055f5f436084975bb624415b46ddb330f0fe
+DIST rust-mode-0.3.0_p20180221.tar.xz 37392 BLAKE2B 185511a2096400254e141f213f2e9a84861c2aaf5f2259cab724aa929e07b2691ae6f36c5568de5d978809588271486377a194a77a066413df6ee995e9bbe54a SHA512 004bd1536ab2e1e708193509a307ed47e22bf1f3dc5d84816958588e312c8bf6e75ee178cc99439ec0bd427ba02030c133bb21f96c5116b175d1d7cde89e9e6c
 DIST rust-mode-1_beta20150411.tar.gz 18155 BLAKE2B 140cad8709f742216822b3933cac64dc7d136fe9fbf0ddec523b395cb148cd8935587a590be41187c4cdfce43b64a72ede9a67a2e77fa7b11b9562e20ae729da SHA512 fc9fe74ba4924cf54664f37c5a88d86b38e17e4ad5e0d4d924afd7f3c8428764dece81cfbe40397460685859f34c3eb841b2c83aef8f34526f4ed3f065cc504e
+EBUILD rust-mode-0.3.0_p20180221.ebuild 679 BLAKE2B da7156d08130a1d2a2b3970f79381f3dcf317770c07537a4c9f6c7cf06d60daafbd4c9091257c36bffa7b56a5a0fc876ba306eb7ce723f6caf897e27f04874d2 SHA512 d97e2791fa05253774fa0bb8ced86205198c22b0a86123e2b6b15631626671b99b3ec3aaf48bd1d71b1bef7574c26e43f7bf0e568f59949c068485b38c9e159a
 EBUILD rust-mode-1_beta20150411.ebuild 390 BLAKE2B e8a113bbd26def8a25028137a014fbece7162b796487019f126d762feaf02580c1b9990a674ff16e42504eef163db756bc81eed47ab413e1fae08749866bef7b SHA512 67338f49c3425fee73dff8ab4de618ca049857b331f38d7fe1d43b8eb20a08fdd801c0c8351932f012ae0a0c4724601007823cb5708325de8dd1a4363b80bc81
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/rust-mode/rust-mode-0.3.0_p20180221.ebuild b/app-emacs/rust-mode/rust-mode-0.3.0_p20180221.ebuild
new file mode 100644
index 000000000000..a061b8c60336
--- /dev/null
+++ b/app-emacs/rust-mode/rust-mode-0.3.0_p20180221.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A major emacs mode for editing Rust source code"
+HOMEPAGE="https://github.com/rust-lang/rust-mode"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} \
+		-l rust-mode.el -l rust-mode-tests.el \
+		-f ert-run-tests-batch-and-exit || die "tests failed"
+}
+
+src_install() {
+	elisp-install ${PN} rust-mode.{el,elc}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
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
+}