gentoo resync : 10.04.2018

12 files changed, 119 insertions, 44 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 14b6be29ba67..4a9a3101ff43 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ghc-mod/Manifest b/app-emacs/ghc-mod/Manifest
index f8431ec04e1e..1aeec1836a98 100644
--- a/app-emacs/ghc-mod/Manifest
+++ b/app-emacs/ghc-mod/Manifest
@@ -1,11 +1,9 @@
 AUX 50ghc-mod-gentoo.el 75 BLAKE2B 8b6c9f3d2a9d3d69700cbdf36a58a3bf07913e7a6369d9a53d39296fd31e2594564fdc20e123093908448acfed9d4d242fed4e93660a6a753ff9b551e6aeeaf0 SHA512 483a8d3e464aa4c3252b38bca4b9291a94080c04407df8f7c8ac110e14eb539c6795ae70ed3d6c217db39fd29a6be7c08b8bc295ef1fd2cd1d2aa7efeba7d0f4
-AUX ghc-mod-5.4.0.0-gentoo.patch 449 BLAKE2B 14576d7f969a53a72fd59facbcce154bbdb12fe8f7367ca4df06b288c5e474045d3a220e3a15b7d7a8d240a411cc866e69ff74ec7c4c2d9d62719353e7bd189a SHA512 71fd518ed4b47421e8edd837987b3cea30094bc4c5d74bf16e2154dc5d6873fccb44c037c7b15e6b5d7cf5598292b2abfa7a3ca404f30d450a7d2c3f4bcd41f1
-AUX ghc-mod-5.5.0.0-gentoo.patch 449 BLAKE2B 14576d7f969a53a72fd59facbcce154bbdb12fe8f7367ca4df06b288c5e474045d3a220e3a15b7d7a8d240a411cc866e69ff74ec7c4c2d9d62719353e7bd189a SHA512 71fd518ed4b47421e8edd837987b3cea30094bc4c5d74bf16e2154dc5d6873fccb44c037c7b15e6b5d7cf5598292b2abfa7a3ca404f30d450a7d2c3f4bcd41f1
-AUX ghc-mod-5.6.0.0-gentoo.patch 210 BLAKE2B 54779ece5c8d8a91f74534d3fea574c28dfc893eeb6a70b5846c612461c9e365035351deec26b4c4a0e806a5a66e0890b3ed2313f21fcd21cbbc622425f14dcd SHA512 85162dafbc6514cb9aef2b78f2ac116259e792c4654a1aee9c873824158ded69b5478310d474adeed10ea87024f0ace08b24440bc8fd1c6c0732618ec0244562
+AUX ghc-mod-5.6.0.0-gentoo.patch 134 BLAKE2B 51f5561d87628191bc070c3f4ce57d19bc0c784df483a24e1e90546014e1b74878514c13049f13efe12c81b59f2311ab1567970a1c792c316de7b44ed8f269a3 SHA512 34fda23f27d1ba0ccad898e9b6d5bbd2f3e2d235e692e910a76c35c894985d0453219b7ab53c4dacb8d3b88f7aea79f5badf92ad8eee90b764e7c1e009135e56
 DIST ghc-mod-5.4.0.0.tar.gz 132546 BLAKE2B 6670df6b271527ee2a69c74b0522b94e78e799b62d260ca744a382312c815e904d516345c6258be0d9aa82f91866126b95cc4682bc1925616078ffef1a559905 SHA512 fabcc5ce2fb9e8790043faae2d42b3714fab96da1409d7f1c4736f332c6b74c76724dce253456fd787526d125cfaa1fe48c4725a0da16aabb35d5edf560f2415
 DIST ghc-mod-5.5.0.0.tar.gz 150774 BLAKE2B 87d2be174200f05da0f38a2947c4404c0b25ce77a03d3b456f8cde769e978bbe6fad6e2c04d1af61e05d61fb941c139c297baaeb4835c02390516a88bebbf539 SHA512 006f292394fc24766a2ae2c778635697a63e1b48ef96052af66dc35d1ef30eb600760cd2a517011a7a2b027a0c725ceb3b5e37cfe157741ba97f19068f1264e8
 DIST ghc-mod-5.7.0.0.tar.gz 146797 BLAKE2B b5d684dbb505001bfc061473cd62d00491bfe8ca5710cb69c72cb2544838a9a3b7d88d414be8123f9edf82cf96773f49439912a98efec843c167334d31caeaf8 SHA512 843cd0546c0a0cdf30dd9cde5e9148dabf391648bae6d7f2852c83a4cd5b8329f30d0cc578ba6afda02e8885b2ed63c7def4885e0dbaac199d311e476a0cc6e3
-EBUILD ghc-mod-5.4.0.0.ebuild 2605 BLAKE2B 2cd31947d4702f7939ffe89d9e9c9f13d3409c0ff4dba49cc2dc418e190b8f2bf9006f9f72bf2feb092dd9d15b4f8960d554b1330b6d9c47606ff4eb2d1932ae SHA512 12d41267fa77a2e9186a731835f961875056e0598f7e9986352f37c232fbd0d3843cc77f274a4ee16f08cc02bdfc3e6f4f09c796a86ea9f21fd93b6b6a0c1f56
-EBUILD ghc-mod-5.5.0.0-r1.ebuild 3063 BLAKE2B a390f559b492d2e0c5f362c3477951f9dc969d7b87dfcd2bad10cfc7e5c06f86a8dadcc5dd8573e2af287c3e15454619bae1833edf425b0936af04d77655519e SHA512 d1d6911a8b7b98ce052a8e9ff577b28f58e472bf50aa5514f0ccbda125bf898fb2dfdd566d4419c6e6895c75ce8bcf775975a460cb90983a6db5b9f6b54ea4a7
+EBUILD ghc-mod-5.4.0.0.ebuild 2605 BLAKE2B ae293eb8f1417d88a0659a5d4b2d4899c6f697f42e8090dfc34f69b7f1ee9056c0e58101f5367fa8b0877ef6833e89f4d81bdc7389901661083d647b1afc1ea4 SHA512 7432db717423e013f51521d7faea351f4138d0215f8ff80e0891d996a28ae3991bfd183c7929f09e324d00b490719e383b6434f592ef565125e1a1dbe32e0a8d
+EBUILD ghc-mod-5.5.0.0-r1.ebuild 3063 BLAKE2B 0982900342cfad1ebdd568ca17be7a624eb3881b98e762575aa1f88088d59830dad99e025feea0172801c72bf41b883644f02b56861e2edf478cccad85b52319 SHA512 a2e922544860a0de09a9fae0e37fa4ef2b6627478e8c085c9f5287f24bf943c95a00f390fefd97a4f9e50f21da58e38b8b3f9960e36c81031cde70670bf95278
 EBUILD ghc-mod-5.7.0.0.ebuild 3372 BLAKE2B b628625dae8816f22c811cf6c6fab880ce3f1721aca59fcf886a1f4d03875a4663f8b39042e16fca39947b031789453d0c4f18abd5884239db57d28a630ec704 SHA512 071a98379192e9470d9e10de2aec2f6737545de1553d888bdded5bdf125dcd5d66c3eb1ee390cbb6b24618dfb788c52a63c8e3610d2ded2a049c5d446697ac08
 MISC metadata.xml 703 BLAKE2B 633cfa473fd42566e57255fd97a3b92bb95b2d0e69fb108091aafa8b6d2293c19b8bd09308ad566bbe55ebebb92eed7cf1f70b0f0110384d79788b8b48ae3dfc SHA512 3aff74a7020a4e77247301e09821025a5e7fce4e39186e2a7b316c4c06f7e99b836bdce4d91ae190fa05e5481bbf1d33c12e440387797ee83403017e21559e31
diff --git a/app-emacs/ghc-mod/files/ghc-mod-5.4.0.0-gentoo.patch b/app-emacs/ghc-mod/files/ghc-mod-5.4.0.0-gentoo.patch
deleted file mode 100644
index f852744aadb9..000000000000
--- a/app-emacs/ghc-mod/files/ghc-mod-5.4.0.0-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ghc-mod.cabal.orig	2015-04-18 13:14:37.566613645 +0200
-+++ ghc-mod.cabal	2015-04-18 13:14:53.420241209 +0200
-@@ -26,8 +26,6 @@
- Category:               GHC, Development
- Cabal-Version:          >= 1.14
- Build-Type:             Custom
--Data-Files:             elisp/Makefile
--                        elisp/*.el
- Data-Files:             LICENSE COPYING.BSD3 COPYING.AGPL3
- Extra-Source-Files:     ChangeLog
-                         SetupCompat.hs
diff --git a/app-emacs/ghc-mod/files/ghc-mod-5.5.0.0-gentoo.patch b/app-emacs/ghc-mod/files/ghc-mod-5.5.0.0-gentoo.patch
deleted file mode 100644
index f852744aadb9..000000000000
--- a/app-emacs/ghc-mod/files/ghc-mod-5.5.0.0-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ghc-mod.cabal.orig	2015-04-18 13:14:37.566613645 +0200
-+++ ghc-mod.cabal	2015-04-18 13:14:53.420241209 +0200
-@@ -26,8 +26,6 @@
- Category:               GHC, Development
- Cabal-Version:          >= 1.14
- Build-Type:             Custom
--Data-Files:             elisp/Makefile
--                        elisp/*.el
- Data-Files:             LICENSE COPYING.BSD3 COPYING.AGPL3
- Extra-Source-Files:     ChangeLog
-                         SetupCompat.hs
diff --git a/app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch b/app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch
index 40302168692a..f7e6e1c4c654 100644
--- a/app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch
+++ b/app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch
@@ -1,5 +1,5 @@
---- a/ghc-mod.cabal.org	2016-07-29 09:18:31.000000000 -0400
-+++ b/ghc-mod.cabal	2016-08-08 23:16:00.171679823 -0400
+--- a/ghc-mod.cabal
++++ b/ghc-mod.cabal
 @@ -29,2 +29,0 @@
 -Data-Files:             elisp/Makefile
 -                        elisp/*.el
diff --git a/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild b/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
index f46308b3aa0e..3c52fd7d1b66 100644
--- a/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
+++ b/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -53,7 +53,7 @@ DEPEND="${RDEPEND}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.4.0.0-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-5.6.0.0-gentoo.patch
 }
 
 src_compile() {
diff --git a/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild b/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
index 1a0636bb8be0..82d7ae03eec4 100644
--- a/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
+++ b/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -53,7 +53,7 @@ DEPEND="${RDEPEND}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.5.0.0-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-5.6.0.0-gentoo.patch
 }
 
 src_compile() {
diff --git a/app-emacs/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
index 30c179f21487..add1b63c7737 100644
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@@ -11,7 +11,7 @@ DIST ruby-2.4.1.tar.xz 9939188 BLAKE2B 5be893c8996d17ff333276a772747d3099cec0c41
 DIST ruby-2.5.0.tar.xz 11292472 BLAKE2B 852ce003a79d9d77e72928353382962440e99ed1d03558c89a928e8f4a582b27357ef63e3ef45f3b30009f7a95f356100941bd84151571ade3a88b2d0595f8ad SHA512 55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578
 EBUILD ruby-mode-2.0.0_p247.ebuild 568 BLAKE2B 24b39cf684d204d000ccee421c8d06186e36c7bf444790e36ffa6987ba6a2b5d1927b527ee47af55cf0cfccf8990692dcb31ab584d3d1befc811afe96a8a19bc SHA512 69a1c4bcecb6a545b5a9c871152f5917524b158df8fdf507989f53f0968830613a86986e82c62771f3632979e4129c0fc1b70ed262ce193fb7730484590b0a6b
 EBUILD ruby-mode-2.2.2.ebuild 496 BLAKE2B 7227da6ffc85192d2c13ac6e1a172e26f40892f0dfb39e11020584d5e4dca28bea31f864b26fdb429e9633bf2c40b8e55a3ed9f1078d459032fa7ee767f33212 SHA512 5dd65768c7b7d51f1bff2b4ac12918fbb4178f876fa1ef8ade21623fa51bdb36496c4e247b40a3dc27c6f8e2786276f73c77fa7287fd8d8534213606b986b374
-EBUILD ruby-mode-2.3.0.ebuild 495 BLAKE2B 2b79bdfa7d545d23f2248e15914bb30b90154e0542b5728f88d6340b5aa4e98773caba2f73c6a14cdebe64477978e18224154a6d9a8488d0940da67a5dc269b4 SHA512 e177358dec3430f057b4c39c818f10d6d1ce4c15786df960210b658e5d0af037d1eb9750180988bf17804d3888b463a41848450817243a151ae7b23d7acdf45d
+EBUILD ruby-mode-2.3.0.ebuild 494 BLAKE2B 31c71bd89eff5c173571f09ceff570f16c8f9ca01ded4541f8f021c96212f8c0112b49ba58f409ecd1caf9016706d8f254d938575cb3a324b6890ed6f2a3bb14 SHA512 0df916f8b8a5d7a3d2a7fa0613e74e3306398cb5f1a1c59f2bde940c9dba060f5675580cf5091333a243227b5c23bb4e176f86f9151e0311c95799c82a181efa
 EBUILD ruby-mode-2.4.1.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
 EBUILD ruby-mode-2.5.0.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild b/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
index 84e79702dc99..ad53fe111d7a 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/ruby-${PV}/misc"
 DOCS="README"
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index 33ad2102a327..7be0691cbd26 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -6,9 +6,10 @@ AUX 2.11/dont-load-sbcl-pprint.patch 556 BLAKE2B feb05a884c8fa088efec7907405dfcf
 AUX 2.11/gentoo-changelog-date.patch 803 BLAKE2B 0adbe6e88ef0470d27ffe8ae4e18d86ed5dcdb062026bdaec6966609d167530e21a439fc3465274cd5b578b29a2ac48e08ac314789cd060b7456a48fae443b72 SHA512 ae0f07c74988733a070bfd3ca4192ab3de7ebd5bab4705e6419f17986a833a35e0e4f84dad6c0e16cb051eb5ca612ae958a73f3cde327416eb4726a8139ac4b5
 AUX 2.15/gentoo-changelog-date.patch 790 BLAKE2B acb85ec980c299eef7bff5f766b0674a38695549f86af8df5d3e87b3fc62943a364fba5e1d87faec251ee9c11ba19ff1dac6ac790a1acd25338fb062ab68269f SHA512 f5dd64feccd905d92743135dec9158e258f3bbae06032ab2059878701d9c308416e355ef2a9d01113df8a4763f4d2ce3d15d42e6ed36470065de079c495ca057
 AUX 70slime-gentoo.el 526 BLAKE2B 6bfd25cf1ef661ac1510d6862d8eea832d1de11d173d7a4c1fc6f12c204c13b641382a23b196c21ad6a4825b620c69244764db65e94060e4b636c5b6702e871c SHA512 94c84b4a91cad91f553c22cc9d61cb6a77aa0dd723571770159237e7d3e6f2ec0e3dc0a3e139a99bd820da67d019891db1e84d384fb96614f086b54e9bd5769e
+AUX slime-2.20-fix-doc-build.patch 3547 BLAKE2B 10c45bfe0c638080373071d3c357f9dbb1161804b172259a0763d69ce41ac3cf1c9d3156f6379ba542d23b977b9698fbb17d9f4ca4825549c6639927a568fbca SHA512 3c8b762a6512c9558743bac4fc1b3804472fe637e44bd255e5c69e2221cc053e1a9099e9ce829f4935911b91ecb1f6fe1e6629ebc9e389e8ddbbd9b1366b1354
 AUX swank-loader.lisp 68 BLAKE2B 6cc412c9e0d5357835741486c7c26dd58edaef9d8a4544bf9f3cb416973e76a2e5456d86bf930a66ae60ddbf637523537914fe43a7d5c3793877b194df63ad90 SHA512 2d4c86b5ed9e19268356e6cc97a3693b005f20e40d16a94f4df99953108ce21ee46db6c951218bedb5ec34b086835476424af1ed863989bcd18a9123d03982a7
 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.ebuild 1716 BLAKE2B 263677e7db9a5431c19f4b254b37909c4f5bb144aee72422257fe6f6bb8ff7c882fef4829a9ffa21898a8894847e42f4d2c07eb4fd705ecafad0741fa5089e41 SHA512 dc0b7b8fc41b0ffe90c1f70104a132f35c2c41ad983a28ac2a52f49f613d39a74a23f5de24b4e0e95f3dcdf7e6920ca5e3dc65222edc1dd8b4ae16be8c51fb21
+EBUILD slime-2.20.ebuild 1708 BLAKE2B 99958f9ea78e9af1eb690ace54c621f42ae1b96dd78aceb9084e1817a52ea07c127192400d94728c80ecd70233397127dc5e0665f46c6d154a3a53da075ca0ae SHA512 ba967a72f9cb0228e16420886194341c3257267f112e62c63f51e52b4c17bcb1890411d3de1120cc242c5806e4d3cdd48ffb00d78b10565296dd1148f8f50cb5
 MISC metadata.xml 1658 BLAKE2B 8ee9c10524fff6691e0025e7fee60b2fcc92a685dbc55d2abfca2d06591bab471f529e6edd6621d8128a09bd57cab51b73006d951440ea2842312cb5509025a1 SHA512 8147f1f31e699a4de10274a27f8c86427f9245050f2297d11804281f12ed9f7bbc1ae0ca615ffb009e7ce4a57b0c0395e4bc95cc5b043f0e24290660fe65b89a
diff --git a/app-emacs/slime/files/slime-2.20-fix-doc-build.patch b/app-emacs/slime/files/slime-2.20-fix-doc-build.patch
new file mode 100644
index 000000000000..c95608c7705a
--- /dev/null
+++ b/app-emacs/slime/files/slime-2.20-fix-doc-build.patch
@@ -0,0 +1,94 @@
+diff -Nuar a/doc/slime.texi b/doc/slime.texi
+--- a/doc/slime.texi	2017-08-28 13:51:57.000000000 +0200
++++ b/doc/slime.texi	2018-04-08 17:21:16.004697168 +0200
+@@ -1219,7 +1219,8 @@
+ Describe the slot at point.
+ 
+ @kbditem{e, slime-inspector-eval}
+-Evaluate an expression in the context of the inspected object.
++Evaluate an expression in the context of the inspected object.  The
++variable @code{*} will be bound to the inspected object.
+ 
+ @kbditem{v, slime-inspector-toggle-verbose}
+ Toggle between verbose and terse mode. Default is determined by
+@@ -1250,8 +1251,7 @@
+ Store the value under point in the variable `*'.  This can
+ then be used to access the object in the REPL.
+ 
+-@kbditempair{TAB, S-TAB, slime-inspector-next-inspectable-object,
+-slime-inspector-previous-inspectable-object}
++@kbditempair{TAB, S-TAB, slime-inspector-next-inspectable-object, slime-inspector-previous-inspectable-object}
+ 
+ Jump to the next and previous inspectable object respectively.
+ 
+@@ -2016,7 +2016,7 @@
+ On the emacs side you will use something like
+ @example
+ (setq slime-net-coding-system 'utf-8-unix)
+-(slime-connect "127.0.0.1" 4005))
++(slime-connect "localhost" 4005))
+ @end example
+ to connect to this lisp image from the same machine.
+ 
+@@ -2028,7 +2028,7 @@
+ remote machine.
+ 
+ @example
+-ssh -L4005:127.0.0.1:4005 username@@remote.example.com
++ssh -L4005:localhost:4005 username@@remote.example.com
+ @end example
+ 
+ That ssh invocation creates an ssh tunnel between the port 4005 on our
+@@ -2044,9 +2044,9 @@
+ @end example
+ 
+ The @kbd{RET RET} sequence just means that we want to use the default
+-host (@code{127.0.0.1}) and the default port (@code{4005}). Even
++host (@code{localhost}) and the default port (@code{4005}). Even
+ though we're connecting to a remote machine the ssh tunnel fools Emacs
+-into thinking it's actually @code{127.0.0.1}.
++into thinking it's actually @code{localhost}.
+ 
+ @c -----------------------
+ @node Setting up pathname translations
+@@ -2323,8 +2323,7 @@
+ 
+ @table @kbd
+ 
+-@kbditempair{C-<up>, C-<down>,
+-             slime-repl-forward-input, slime-repl-backward-input}
++@kbditempair{C-<up>, C-<down>, slime-repl-forward-input, slime-repl-backward-input}
+ Go to the next/previous history item.
+ 
+ @kbditempair{M-n, M-p, slime-repl-next-input, slime-repl-previous-input}
+@@ -2333,16 +2332,14 @@
+ a row, the second invocation uses the same search pattern (even if the
+ current input has changed).
+ 
+-@kbditempair{M-s, M-r,
+-slime-repl-next-matching-input, slime-repl-previous-matching-input}
++@kbditempair{M-s, M-r, slime-repl-next-matching-input, slime-repl-previous-matching-input}
+ Search forward/reverse through command history with regex
+ 
+ @c @code{slime-repl-@{next,previous@}-input}@*
+ @c @code{slime-repl-@{next,previous@}-matching-input}@*
+ @c @code{comint}-style input history commands.
+ 
+-@kbditempair{C-c C-n, C-c C-p,
+-slime-repl-next-prompt, slime-repl-previous-prompt}
++@kbditempair{C-c C-n, C-c C-p, slime-repl-next-prompt, slime-repl-previous-prompt}
+ Move between the current and previous prompts in the @REPL{} buffer.
+ Pressing RET on a line with old input copies that line to the newest
+ prompt.
+@@ -2655,6 +2652,11 @@
+ If @code{slime-autodoc-use-multiline-p} is set to non-nil,
+ allow long autodoc messages to resize echo area display.
+ 
++@vindex slime-autodoc-mode-string
++@code{slime-autodoc-mode-string} is a string that will be displayed in
++the mode line when autodoc-mode is enabled, or nil, if you prefer no
++indication. You can customize this variable.
++
+ @node ASDF
+ @section ASDF
+ 
diff --git a/app-emacs/slime/slime-2.20.ebuild b/app-emacs/slime/slime-2.20.ebuild
index b8a5bdb9d7fa..943b134b2fa6 100644
--- a/app-emacs/slime/slime-2.20.ebuild
+++ b/app-emacs/slime/slime-2.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit elisp eutils
+inherit elisp
 
 DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
 HOMEPAGE="http://common-lisp.net/project/slime/"
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE="doc xref"
 RESTRICT=test # tests fail to contact sbcl
 
@@ -25,22 +25,26 @@ 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
-	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
+	if use doc ; then
+		VARTEXFONTS="${T}"/fonts \
+			emake -C doc all
+	fi
 }
 
 src_install() {