diff options
author | 2014-12-19 07:02:25 +0000 | |
---|---|---|
committer | 2014-12-19 07:02:25 +0000 | |
commit | 6e2d424f700d8602c0b671c4a99fecb4c484bf82 (patch) | |
tree | cf7a988c0490a9215e831bd3d274c144cbdd5f2a /app-emacs | |
parent | Add common-lisp-3.eclass from the lisp overlay, required by app-emacs/slime-2.11 (diff) | |
download | historical-6e2d424f700d8602c0b671c4a99fecb4c484bf82.tar.gz historical-6e2d424f700d8602c0b671c4a99fecb4c484bf82.tar.bz2 historical-6e2d424f700d8602c0b671c4a99fecb4c484bf82.zip |
Bump slime to 2.11, as requested in Bug 530148
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F
Diffstat (limited to 'app-emacs')
-rw-r--r-- | app-emacs/slime/ChangeLog | 12 | ||||
-rw-r--r-- | app-emacs/slime/Manifest | 20 | ||||
-rw-r--r-- | app-emacs/slime/files/2.0_p20110617/70slime-gentoo.el | 15 | ||||
-rw-r--r-- | app-emacs/slime/files/2.0_p20110617/gentoo-dont-call-init.patch | 16 | ||||
-rw-r--r-- | app-emacs/slime/files/2.0_p20110617/swank.asd | 98 | ||||
-rw-r--r-- | app-emacs/slime/files/2.0_p20130214/gentoo-module-load.patch | 84 | ||||
-rw-r--r-- | app-emacs/slime/files/2.11/dont-load-sbcl-pprint.patch | 13 | ||||
-rw-r--r-- | app-emacs/slime/files/2.11/gentoo-changelog-date.patch | 20 | ||||
-rw-r--r-- | app-emacs/slime/slime-2.11.ebuild | 122 |
9 files changed, 398 insertions, 2 deletions
diff --git a/app-emacs/slime/ChangeLog b/app-emacs/slime/ChangeLog index 235562502cbc..8d96e0dfd718 100644 --- a/app-emacs/slime/ChangeLog +++ b/app-emacs/slime/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-emacs/slime # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.73 2014/07/11 08:44:28 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.74 2014/12/19 07:02:16 gienah Exp $ + +*slime-2.11 (19 Dec 2014) + + 19 Dec 2014; Mark Wright <gienah@gentoo.org> + +files/2.0_p20110617/70slime-gentoo.el, + +files/2.0_p20110617/gentoo-dont-call-init.patch, + +files/2.0_p20110617/swank.asd, +files/2.0_p20130214/gentoo-module-load.patch, + +files/2.11/dont-load-sbcl-pprint.patch, + +files/2.11/gentoo-changelog-date.patch, +slime-2.11.ebuild: + Bump slime to 2.11, as requested in Bug 530148 11 Jul 2014; Patrick Lauer <patrick@gentoo.org> slime-2.0_p20101103.ebuild: Stable on amd64 #511170 diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest index cc750802d31c..c8a12563916b 100644 --- a/app-emacs/slime/Manifest +++ b/app-emacs/slime/Manifest @@ -1,11 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX 2.0_p20110617/70slime-gentoo.el 573 SHA256 942bcba3b2ed32191f7e531ebeee15d8f35389adb7d89fe6c3e16088a59dab1a SHA512 022e0934c8dcdf208bdfed9810200c8b925059b75e87697760b7e8cc926569da607dc3b723988e1ec49d584c92cdea96afd46642090743e4e593c860a058523f WHIRLPOOL 8293dd3006ff1d63cea569f49bbf86a5c83c4fc780dbd7024070471cea8629ac25e716fc0e9dc5c9ecfc8e9f01a717b762f2aee622ac9b52c8899053c41583e6 +AUX 2.0_p20110617/gentoo-dont-call-init.patch 638 SHA256 ebe27ecb8748a26d943ac480e56a5059fc56ef18816359f8728c909c3875ffd4 SHA512 b99e0dc55e61fda9f21bca9661854b84166834b4330e5f46b10bfd2c3fb61f092046fe8553fdf2d7a7a6350adcd3827315ea681bb53a3ebfec3648b25ac72b84 WHIRLPOOL 8aac59a44df9a7bcb2f274c0262fd6a44fe2be7434e9d7e4e7c37e820f65cda30c237307d10fc992556542c4f8a1a14867846c551d8f129a352fdd6e663ec113 +AUX 2.0_p20110617/swank.asd 4348 SHA256 f87fa018d347616416705c15c0cd3c5dc3f27876ab4eabafd8e623ada389c8ea SHA512 323461a64953c4bd1ca94d68f6a36103c518c69938a205870cd1dcbeb0e3bccc6221a58bf8079ae5c7d17afe06c6732838cc3b2e418ca5dc225603ad3d309479 WHIRLPOOL c254ed1ea86d7e5d045dd450daf46c0bce02fa9dbde081be7afcb2ca1788ccfcbb784304b75ee264b10faf6c920db96934d345c8db8f9c821105cd6862cb71c7 +AUX 2.0_p20130214/gentoo-module-load.patch 3253 SHA256 cea107115bdf7b121a6684d92d2351d58ce008b22a6376cf4ad610e3e5d17be3 SHA512 6489627fad7ab80102b7127bc5e70f74856e0685fbbe4ae92a779f65425b30472ff554cce05e102d2fe652e8216ddcd0f51393651aa3818865a90a215417fcad WHIRLPOOL 56621f3ee5da2bcf3baca92d475844013ebe5e29777ff4000e1b931f2911cc0f8bff71d547596a07e20628302c75476a31d3ea1fff9eca639b9dde0e435959d9 +AUX 2.11/dont-load-sbcl-pprint.patch 556 SHA256 2da392bfd5588cfae087b74b703d8f103d34d446d58d3746c8905cc9fec7257f SHA512 5c0e49aad96da70c74cfda79e8d0654d87ee4996245a22f914ad75902e4acb1315a0c455920a27ca11a15465f8ebbd389655afc5083b0212d16b8541db4f88f4 WHIRLPOOL 7ae9bd2983031355d2014d3aac13baa2cd7168dcda45f1e7cb2c711e5323b8f314dba10369d542f4d3de258ba057db6d5aeae1487f6c23c4dc7f8d3df8d134f7 +AUX 2.11/gentoo-changelog-date.patch 803 SHA256 06d0ad4db7ad7b3013870cfc514677ed9bbfd42c02947a2754c4691da92463d7 SHA512 ae0f07c74988733a070bfd3ca4192ab3de7ebd5bab4705e6419f17986a833a35e0e4f84dad6c0e16cb051eb5ca612ae958a73f3cde327416eb4726a8139ac4b5 WHIRLPOOL c75dc8716606f17dbb4e6d8c726575b7645cb4cfef435e5aba212af683f7aaf85c33a4a2e55194f076ccb2edf3dd3a29681d22facf107aaa6cb5bf3ea097f6d2 AUX 70slime-gentoo.el 526 SHA256 962ab66f1eb1a2ec4a52c61a59f4fc364978d21373c27f293be2fccccfe135db SHA512 94c84b4a91cad91f553c22cc9d61cb6a77aa0dd723571770159237e7d3e6f2ec0e3dc0a3e139a99bd820da67d019891db1e84d384fb96614f086b54e9bd5769e WHIRLPOOL d7940984922c92667c785a58e6741160083283e0a20a0bc0e277448ae10ba582b6e17ce940a90df8056cb22f50bd93236ded1c3eefc57abdd59776adb90e21c5 AUX swank-loader.lisp 68 SHA256 1c42cd16fd6af8e377716c633adb9e0d6172df6001e2aa26eed6a33df420d015 SHA512 2d4c86b5ed9e19268356e6cc97a3693b005f20e40d16a94f4df99953108ce21ee46db6c951218bedb5ec34b086835476424af1ed863989bcd18a9123d03982a7 WHIRLPOOL c8966f6f977f855e9d9f83d16bd5805067f20f544afdbb38053520bfdaede1a70a2b8e3dc086ee97230dff9ac5094da1f20eb5700ee6c9486a0bd27e042af389 DIST slime-2.0_p20080731-patches.tar.bz2 4966 SHA256 0b032a7f6744dac372bfd2036789efd4e9cc7c509e7836e27fee4abc9072a12a SHA512 12dafeeeeab9bc4b63113e6a3cb4e2695867c0f8dd8e08f38af8c1cc403b25ead6a94b0d3ac2ede2c88e2152f01af49964b811301e761545f9589fa969617d85 WHIRLPOOL 5b99322502466f06ccf22a411053316bb31d510eef4f9189f15a544609cd5d1a47f89de6b5a8366a6c62939dfb012133083305404e3a512077b9e1ac7108e04e DIST slime-2.0_p20080731.tar.bz2 596093 SHA256 7c5f3ab65a0e76ff042230a34213f558d9a57c00ef22380876bf9cde9717354b SHA512 c991c6d41c5e694a64c71cd9010aeeb7f79ef308ec1d9e1df63ff4031946cf88f7d2b6819725a17f98fcdf6a1a35f82352a817c1c064b7b205b82c363691b7bc WHIRLPOOL 6f62a33600ca7831dfe0cdc0a94db1b5c849fcc3c8392f5709a65c588f45eec70f78c9930e471652f4926398328d2f2ff9a3c6e9475eb14f9c6233213e6c9416 DIST slime-2.0_p20101103-patches.tar.bz2 4730 SHA256 9cab942f4ea64ec2f0e127db3b5428513c51899e5518d9f8c2bd9143c644fd19 SHA512 7990a3ffa4a5867fe84e326034aa794d3396dd2a74125e256be33524e2e737e052094fa11f2f486db34dc619e89e9343d4c5d2f84f3972139c2c7ac33248ce2c WHIRLPOOL a11ebfdf6b9054ed07ea8af667a5ef909cbe129531ee63dd3b4556fedc4d0e334ed913423a23acab176312b1c781f3c25f1c499184d7f2c6bfe459d4b67c368b DIST slime-2.0_p20101103.tar.bz2 725888 SHA256 0596532fa8cb78e59f685557474bd0ac5d00a79ac84c361ab93f079797a4041f SHA512 cb0cc3232304ef6efec5e01d3660cc649abb3e5803f17c82785b154b6f0b581889ea3b2dcf261be39b16ff22c912c34c7ec84c400856f5c4a29fbeaf7c49851d WHIRLPOOL 3421ea5aa5ed96a3d7b552fe74804bc3e7e822dd21623c0b36f7f84d7ad726fa57d0eb496e15d4ef9ea5027f0c247a3ba8ae7ae46118851c3f0ed13ec1cf482f +DIST slime-2.11.tar.gz 1054516 SHA256 d63962c22f983a52519fb51b5ca28183aeb23ff6892804d02311e54d73ec8b2a SHA512 9507a4460a2f0d5b4f0857824fcaa36f6efeb09aebde7ca682bdc0214b6a722e471180c34ddce26a8f94d7cf3aae959954565ada314729e803d36767afc3e850 WHIRLPOOL 530c5b341f2ca4a95c954cea848c67cfd027345691feb9c246eb56ecaf6c420b642ed1991f1d615dabc0ca1f54bc6b28482e57c800498cf25a17ce39a7dc0ba3 EBUILD slime-2.0_p20080731-r1.ebuild 2431 SHA256 1e320195aadba60b975bc44c771160adad354bc76608f548874770e1b88a76f4 SHA512 521d3e32aa6df496c894f2dedcdadd6658d5d8c5231605d926fb5107f76d1f283f7ef629d920cbc007a88227e0e1ae1afa07ef6023e7be283b87a1f6259bbf3b WHIRLPOOL 169eae12f686e496f10c78f30b19c24515cb10bc2e63a01293951af57a614c9fe328838b77962c334a0bedae5b8d7c970555ec00c1cf0cc3a60a982c9380e1e6 EBUILD slime-2.0_p20080731.ebuild 2525 SHA256 0ea70b38c2277ecec6dfb0bcc174c405654c00e515f36feea57725c8a1056c67 SHA512 f66fdf9a1df9192853781e621fdc9c740a01e39808e6f7c4776a0ef3453a23c8f61bdd2917af14f9bfb261345bea6e56412ef052a16c02070e14e3b176765945 WHIRLPOOL fc9dcd40430c8c16221b2b6b4e4a3710131263cb43d3c2a8cfc0344756ad0948c489a100ad8ccc51b2d1b5e410170c1db79706e39bf72c06b748711de906fbc0 EBUILD slime-2.0_p20101103.ebuild 2574 SHA256 3ae3d9f21e44248ffd6716cddb5755fb5c31c9862dfbda80b3bbce89a3e940b3 SHA512 3c378626ec32c099cf697c19c0f45dfc08e18f410a6a73a84b7c5029165ad083eb6c2afb14b06c02d2233bf2706ded2f50cfc477c8b585f776486f476d8cc32c WHIRLPOOL 97973c9f5ac4159a551f87d37ea677bd959020ca88100b0e141e928ec5bf68af141aa4b251921b0af939de4f55e86e87b89db862c0b809e7e0a2ce22ed504ab2 -MISC ChangeLog 17220 SHA256 3ed4b9f736331afdf5edd337a04d39d027fbc2ee9e3fd8bfea7733ba44974bf7 SHA512 2c7ae342949e14cf2e23b5ab46e25a1c246e98bf72c8bdb11aaa54d680ff342b0ca0ecda62d25bfafce80004da25f49e98388303b07423e621bcf75b32836fb1 WHIRLPOOL 8b8db60fed3f24f01ff07321c71c3553c29f55a98d8e2683c4c7cea3a965931ffb81723c5606e42e0fc4f0b6a84b1ad88743872a23682abe395756161c5ddde3 +EBUILD slime-2.11.ebuild 3807 SHA256 4b9ba483df21a3d2e0c140131997cd7fcdf4126fbb3fb20bf4a88aaeb9c6a252 SHA512 8bde739a0169821ea1b12f84e40994f94130c7e63f30ccd3e38491385d2e53d4c175cde6e38b756c8c7c4e7d93ebff14d8a23ec12bb2c3d285c9497fa06b2f48 WHIRLPOOL 7b1fa9c93e213b9d82b5159a6de029332f6f089f4c0e79b9b5684f2d4978c270cdd67a8889da80d7cf97ac4ee11f5ec0f6fd6046d956a02de9daf849c7aa1b03 +MISC ChangeLog 17624 SHA256 bc5488a660417fac9a064570aa779e01c4872db00db78a06a8e30f9d1f5a76c1 SHA512 970925b40e0986e72535df6474196aaa20d7821ff8dbd08f12a30aea0d0db14ac84288ce73b85f68c9b2891223c30f0e8d7a2cb002227c88f06518afd13689bc WHIRLPOOL b25f19fe5bf53750ecfa4650d23c4f2317cdfafa70e53df000c63d902c1bc34818402072d124b04b25a470870df34d903e0692a3bb9f746d0ffff3bc90a45e24 MISC metadata.xml 1348 SHA256 d2fb2fdc46daf7c6f59260a6a05e745d54f1d7292078fc21c33bec36cda862c1 SHA512 19751b19a1bb3746c214293d5c6640d49a69dbdf5a48138c37de62b700c7feda094e337907c315556a13660a9d0dfc668fc7193ff852ebd327b787c55f96b47c WHIRLPOOL 3a468620bf40acb162697ee0c9869607673a28e2c5190a373bf30ebb3a91ead7084786f21898b9d3e65d46a8e5f57fc5e4fa4ee88bbf05262a1f23341f4cb38a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iF4EAREIAAYFAlSTzX8ACgkQoBEVQmGOlx/RVgD+N0zgBqEHkse2e7wNo2c9M4RF +dlusXnj8O0panwW6kJwA/RfEHynQbqwCGuVJSUoW5WaOdpOKiBL6905eYtLbauPU +=Cqtq +-----END PGP SIGNATURE----- diff --git a/app-emacs/slime/files/2.0_p20110617/70slime-gentoo.el b/app-emacs/slime/files/2.0_p20110617/70slime-gentoo.el new file mode 100644 index 000000000000..358af67d918d --- /dev/null +++ b/app-emacs/slime/files/2.0_p20110617/70slime-gentoo.el @@ -0,0 +1,15 @@ +;;; site-lisp configuration for SLIME + +(add-to-list 'load-path "@SITELISP@") +(add-to-list 'load-path "@SITELISP@/contrib") +(autoload 'slime-highlight-edits-mode "slime-highlight-edits") + +(require 'slime-autoloads) +(slime-setup '(slime-fancy slime-asdf slime-banner)) + +;; this allows us not to require dev-lisp/hyperspec +;; (which is non-free) as a hard dependency +(setq common-lisp-hyperspec-root + (if (file-exists-p "/usr/share/doc/hyperspec/HyperSpec") + "file:///usr/share/doc/hyperspec/HyperSpec/" + "http://www.lispworks.com/reference/HyperSpec/")) diff --git a/app-emacs/slime/files/2.0_p20110617/gentoo-dont-call-init.patch b/app-emacs/slime/files/2.0_p20110617/gentoo-dont-call-init.patch new file mode 100644 index 000000000000..410c3913a2a1 --- /dev/null +++ b/app-emacs/slime/files/2.0_p20110617/gentoo-dont-call-init.patch @@ -0,0 +1,16 @@ +Author: Stelian Ionescu <sionescu@cddr.org> +Date: 2010-05-14 +Status: Gentoo-only +Description: Dont' call SWANK-LOADER:INIT on startup since we don't use + the upstream swank-loader.lisp + +--- a/slime.el ++++ b/slime.el +@@ -1323,7 +1323,6 @@ See `slime-start'." + `(progn + (load ,(slime-to-lisp-filename (expand-file-name loader)) + :verbose t) +- (funcall (read-from-string "swank-loader:init")) + (funcall (read-from-string "swank:start-server") + ,(slime-to-lisp-filename port-filename) + :coding-system ,encoding))))) diff --git a/app-emacs/slime/files/2.0_p20110617/swank.asd b/app-emacs/slime/files/2.0_p20110617/swank.asd new file mode 100644 index 000000000000..b33ca6e67cb0 --- /dev/null +++ b/app-emacs/slime/files/2.0_p20110617/swank.asd @@ -0,0 +1,98 @@ +;;;; -*- Mode: Lisp; indent-tabs-mode: nil -*- + +(defpackage #:swank-system + (:use #:common-lisp #:asdf)) + +(in-package #:swank-system) + +(defun load-user-init-file () + "Load the user init file, return NIL if it does not exist." + (load (merge-pathnames (user-homedir-pathname) + (make-pathname :name ".swank" :type "lisp")) + :if-does-not-exist nil)) + +(defun load-site-init-file () + (load (make-pathname :name "site-init" :type "lisp" + :defaults (truename + (asdf:system-definition-pathname + (asdf:find-system :swank)))) + :if-does-not-exist nil)) + +(defclass no-load-file (cl-source-file) ()) + +(defmethod perform ((op load-op) (c no-load-file)) nil) + +(defmacro define-swank-system (sysdep-files) + `(defsystem :swank + :description "Swank is the Common Lisp back-end to SLIME" + :serial t + :components ((:file "swank-backend") + (:file "nregex") + ,@(mapcar #'(lambda (component) + (if (atom component) + (list :file component) + component)) + sysdep-files) + (:file "swank-match") + (:file "swank-rpc") + (:file "swank") + (:module "contrib" + :components ((:no-load-file "swank-c-p-c") + (:no-load-file "swank-arglists" + :depends-on ("swank-c-p-c")) + (:no-load-file "swank-asdf") + (:no-load-file "swank-clipboard") + (:no-load-file "swank-fancy-inspector") + (:no-load-file "swank-fuzzy" + :depends-on ("swank-c-p-c")) + (:no-load-file "swank-hyperdoc") + (:no-load-file "swank-indentation") + (:no-load-file "swank-listener-hooks") + (:no-load-file "swank-media") + (:no-load-file "swank-motd") + (:no-load-file "swank-package-fu") + (:no-load-file "swank-presentations") + (:no-load-file "swank-presentation-streams" + :depends-on ("swank-presentations")) + (:no-load-file "swank-sbcl-exts" + :depends-on ("swank-arglists")) + (:no-load-file "swank-snapshot") + (:no-load-file "swank-sprof")))) + :depends-on (#+sbcl sb-bsd-sockets) + :perform (load-op :after (op swank) + (load-site-init-file) + (load-user-init-file)))) + +#+(or cmu scl sbcl openmcl clozurecl lispworks allegro clisp armedbear cormanlisp ecl) +(define-swank-system + #+cmu (swank-source-path-parser swank-source-file-cache swank-cmucl) + #+scl (swank-source-path-parser swank-source-file-cache swank-scl) + #+sbcl (swank-source-path-parser swank-source-file-cache swank-sbcl swank-gray) + #+(or openmcl clozurecl) (metering + #.(if (and (find-package "CCL") + (fboundp (intern "COMPUTE-APPLICABLE-METHODS-USING-CLASSES" "CCL"))) + 'swank-ccl + 'swank-openmcl) + swank-gray) + #+lispworks (swank-lispworks swank-gray) + #+allegro (swank-allegro swank-gray) + #+clisp (xref metering swank-clisp swank-gray) + #+armedbear (swank-abcl) + #+cormanlisp (swank-corman swank-gray) + #+ecl (swank-source-path-parser swank-source-file-cache swank-ecl swank-gray)) + +#-(or cmu scl sbcl openmcl clozurecl lispworks allegro clisp armedbear cormanlisp ecl) +(error "Your CL implementation is not supported !") + +(defpackage #:swank-loader + (:use #:common-lisp) + (:export #:*source-directory*)) + +(in-package #:swank-loader) + +(defparameter *source-directory* + (asdf:component-pathname (asdf:find-system :swank))) + +;; (funcall (intern (string :warn-unimplemented-interfaces) :swank-backend)) + +;; swank.asd ends here diff --git a/app-emacs/slime/files/2.0_p20130214/gentoo-module-load.patch b/app-emacs/slime/files/2.0_p20130214/gentoo-module-load.patch new file mode 100644 index 000000000000..c25a248d04ab --- /dev/null +++ b/app-emacs/slime/files/2.0_p20130214/gentoo-module-load.patch @@ -0,0 +1,84 @@ +--- slime-9999-orig/contrib/swank-arglists.lisp 2012-08-14 06:50:34.000000000 +1000 ++++ slime-9999/contrib/swank-arglists.lisp 2013-02-14 21:33:26.879124163 +1100 +@@ -9,8 +9,7 @@ + + (in-package :swank) + +-(eval-when (:compile-toplevel :load-toplevel :execute) +- (swank-require :swank-c-p-c)) ++(swank-require :swank-c-p-c) + + ;;;; Utilities + +--- slime-9999-orig/contrib/swank-fuzzy.lisp 2013-02-02 20:48:51.000000000 +1100 ++++ slime-9999/contrib/swank-fuzzy.lisp 2013-02-14 21:35:32.059873714 +1100 +@@ -10,9 +10,8 @@ + + (in-package :swank) + +-(eval-when (:compile-toplevel :load-toplevel :execute) +- (swank-require :swank-util) +- (swank-require :swank-c-p-c)) ++(swank-require :swank-util) ++(swank-require :swank-c-p-c) + + ;;; For nomenclature of the fuzzy completion section, please read + ;;; through the following docstring. +--- slime-9999-orig/contrib/swank-sbcl-exts.lisp 2009-09-25 16:43:33.000000000 +1000 ++++ slime-9999/contrib/swank-sbcl-exts.lisp 2013-02-14 21:33:26.880124185 +1100 +@@ -7,8 +7,7 @@ + + (in-package :swank) + +-(eval-when (:compile-toplevel :load-toplevel :execute) +- (swank-require :swank-arglists)) ++(swank-require :swank-arglists) + + ;; We need to do this so users can place `slime-sbcl-exts' into their + ;; ~/.emacs, and still use any implementation they want. +--- slime-9999-orig/swank.lisp 2013-01-11 20:00:30.000000000 +1100 ++++ slime-9999/swank.lisp 2013-02-14 22:15:39.624982175 +1100 +@@ -2535,14 +2535,17 @@ + "Load the module MODULE." + (dolist (module (ensure-list modules)) + (unless (member (string module) *modules* :test #'string=) +- (require module (if filename +- (filename-to-pathname filename) +- (module-filename module))) ++ (let ((*load-print* nil) ++ (*load-verbose* nil) ++ #+cmu (ext:*gc-verbose* nil)) ++ (require module (if filename ++ (filename-to-pathname filename) ++ (module-filename module)))) + (assert (member (string module) *modules* :test #'string=) + () "Required module ~s was not provided" module))) + *modules*) + +-(defvar *find-module* 'find-module ++(defvar *find-module* 'find-module-gentoo + "Pluggable function to locate modules. + The function receives a module name as argument and should return + the filename of the module (or nil if the file doesn't exist).") +@@ -2572,6 +2575,21 @@ + (some (lambda (dir) (some #'probe-file (module-canditates name dir))) + *load-path*))) + ++(defun swank-fasl-pathname () ++ (make-pathname :name nil :type nil ++ :defaults (car (asdf:output-files ++ (make-instance 'asdf:compile-op) ++ (car (asdf:module-components ++ (asdf:find-system :swank))))))) ++ ++(defun append-dir (pathname dir) ++ (make-pathname :directory (append (pathname-directory pathname) dir))) ++ ++(defun find-module-gentoo (module) ++ (or (let ((*load-path* (list (append-dir (swank-fasl-pathname) '("contrib")) ++ (append-dir swank-loader:*source-directory* '("contrib"))))) ++ (find-module module)) ++ (find-module module))) + + ;;;; Macroexpansion + diff --git a/app-emacs/slime/files/2.11/dont-load-sbcl-pprint.patch b/app-emacs/slime/files/2.11/dont-load-sbcl-pprint.patch new file mode 100644 index 000000000000..c7dafb6cb91a --- /dev/null +++ b/app-emacs/slime/files/2.11/dont-load-sbcl-pprint.patch @@ -0,0 +1,13 @@ +diff --git a/contrib/swank-presentation-streams.lisp b/contrib/swank-presentation-streams.lisp +index 0c24bda..bd5a990 100644 +--- a/contrib/swank-presentation-streams.lisp ++++ b/contrib/swank-presentation-streams.lisp +@@ -65,7 +65,7 @@ be sensitive and remember what object it is in the repl if predicate is true" + (funcall ,continue))))) + + ;;; Get pretty printer patches for SBCL at load (not compile) time. +-#+sbcl ++#+#:disable-dangerous-patching ; #+sbcl + (eval-when (:load-toplevel) + (handler-bind ((simple-error + (lambda (c) diff --git a/app-emacs/slime/files/2.11/gentoo-changelog-date.patch b/app-emacs/slime/files/2.11/gentoo-changelog-date.patch new file mode 100644 index 000000000000..4d7669a34d29 --- /dev/null +++ b/app-emacs/slime/files/2.11/gentoo-changelog-date.patch @@ -0,0 +1,20 @@ +--- slime-2.11-orig/slime.el 2014-12-01 21:05:54.000000000 +1100 ++++ slime-2.11/slime.el 2014-12-19 11:57:45.455393436 +1100 +@@ -134,16 +134,7 @@ + "Return the datestring of the latest entry in the ChangeLog file. + Return nil if the ChangeLog file cannot be found." + (interactive "p") +- (let ((changelog (expand-file-name "ChangeLog" slime-path)) +- (date nil)) +- (when (file-exists-p changelog) +- (with-temp-buffer +- (insert-file-contents-literally changelog nil 0 100) +- (goto-char (point-min)) +- (setq date (symbol-name (read (current-buffer)))))) +- (when interactivep +- (message "Slime ChangeLog dates %s." date)) +- date))) ++ "@SLIME-CHANGELOG-DATE@")) + + (defvar slime-protocol-version nil) + (setq slime-protocol-version diff --git a/app-emacs/slime/slime-2.11.ebuild b/app-emacs/slime/slime-2.11.ebuild new file mode 100644 index 000000000000..a146111aa626 --- /dev/null +++ b/app-emacs/slime/slime-2.11.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.11.ebuild,v 1.1 2014/12/19 07:02:16 gienah Exp $ + +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" + + # 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 + + # 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 +} |