From 6957f5c65b02bba533954eabc0b62f5de36be206 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 10 Apr 2018 17:26:49 +0100 Subject: gentoo resync : 10.04.2018 --- app-emacs/slime/Manifest | 3 +- .../slime/files/slime-2.20-fix-doc-build.patch | 94 ++++++++++++++++++++++ app-emacs/slime/slime-2.20.ebuild | 20 +++-- 3 files changed, 108 insertions(+), 9 deletions(-) create mode 100644 app-emacs/slime/files/slime-2.20-fix-doc-build.patch (limited to 'app-emacs/slime') 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-, C-, +- slime-repl-forward-input, slime-repl-backward-input} ++@kbditempair{C-, C-, 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() { -- cgit v1.2.3