From 15e548c8953c6b87b4e0b88a66f82d6a7b4a1972 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Fri, 17 Nov 2006 10:46:06 +0000 Subject: [PATCH] repair through modified swank.asd plus a bump, as reported in bug #153597 by Anton Kazennikov Package-Manager: portage-2.1.1-r1 --- app-emacs/slime-cvs/ChangeLog | 9 +- app-emacs/slime-cvs/Manifest | 44 +++++++--- .../slime-cvs/files/digest-slime-cvs-0-r4 | 1 + .../slime-cvs/files/digest-slime-cvs-0-r5 | 1 + app-emacs/slime-cvs/files/swank-r5.asd | 84 +++++++++++++++++++ app-emacs/slime-cvs/slime-cvs-0-r5.ebuild | 73 ++++++++++++++++ 6 files changed, 198 insertions(+), 14 deletions(-) create mode 100644 app-emacs/slime-cvs/files/digest-slime-cvs-0-r5 create mode 100644 app-emacs/slime-cvs/files/swank-r5.asd create mode 100644 app-emacs/slime-cvs/slime-cvs-0-r5.ebuild diff --git a/app-emacs/slime-cvs/ChangeLog b/app-emacs/slime-cvs/ChangeLog index 9f0e99e896cc..008fc3e04068 100644 --- a/app-emacs/slime-cvs/ChangeLog +++ b/app-emacs/slime-cvs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emacs/slime-cvs # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime-cvs/ChangeLog,v 1.19 2006/04/12 16:47:17 mkennedy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime-cvs/ChangeLog,v 1.20 2006/11/17 10:46:06 opfer Exp $ + +*slime-cvs-0-r5 (17 Nov 2006) + + 17 Nov 2006; Christian Faulhammer +files/swank-r5.asd, + +slime-cvs-0-r5.ebuild: + repair through modified swank.asd plus a bump, as reported in bug #153597 by + Anton Kazennikov 12 Apr 2006; Matthew Kennedy files/70slime-gentoo.el, +files/README.Gentoo, files/swank.asd, diff --git a/app-emacs/slime-cvs/Manifest b/app-emacs/slime-cvs/Manifest index c195e1760973..e70c5f470c74 100644 --- a/app-emacs/slime-cvs/Manifest +++ b/app-emacs/slime-cvs/Manifest @@ -1,34 +1,52 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 1082475d649a9ddd7b078548dcf234a5 ChangeLog 3014 -RMD160 e2fc0ec126dc588fc51fba51fdff9159575904f6 ChangeLog 3014 -SHA256 63c531c82849df69c1012593c2bf65047470fd8f3087ee958b28de618c9ace2d ChangeLog 3014 +AUX 70slime-gentoo.el 451 RMD160 e15860be7553e588b8f9f547eae42804e2f1a214 SHA1 9b6ef6bf765bc63938086872f4bab0c31ffa5404 SHA256 5816afae1dc4dbb77fe0413504688de0add083aab9217940edf9f6c8f2eb4f36 MD5 0d610ac7f0c3daa87614b1b72a4d40fd files/70slime-gentoo.el 451 RMD160 e15860be7553e588b8f9f547eae42804e2f1a214 files/70slime-gentoo.el 451 SHA256 5816afae1dc4dbb77fe0413504688de0add083aab9217940edf9f6c8f2eb4f36 files/70slime-gentoo.el 451 +AUX README.Gentoo 347 RMD160 d14589acdadaa746e145fecf50382d6055c87ae1 SHA1 b0c783443f7d57f6610abf71141bcffaddad34f8 SHA256 fdc51ac5cea0e5cecc83eaed30d086da1f7aa60ded9b98c535445a062c0a3679 MD5 1ab5127efd37110d1dc0711ec5626a92 files/README.Gentoo 347 RMD160 d14589acdadaa746e145fecf50382d6055c87ae1 files/README.Gentoo 347 SHA256 fdc51ac5cea0e5cecc83eaed30d086da1f7aa60ded9b98c535445a062c0a3679 files/README.Gentoo 347 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-slime-cvs-0-r4 0 -RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-slime-cvs-0-r4 0 -SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-slime-cvs-0-r4 0 +AUX swank-loader.lisp 68 RMD160 28a2624c60122f50ff758923c4ca2ee666ec25ee SHA1 2f1a69b01814de704b9d041096d7c3e20d32faba SHA256 1c42cd16fd6af8e377716c633adb9e0d6172df6001e2aa26eed6a33df420d015 MD5 cd3eddef773c2bdc1eac336383f13ec6 files/swank-loader.lisp 68 RMD160 28a2624c60122f50ff758923c4ca2ee666ec25ee files/swank-loader.lisp 68 SHA256 1c42cd16fd6af8e377716c633adb9e0d6172df6001e2aa26eed6a33df420d015 files/swank-loader.lisp 68 +AUX swank-r5.asd 2264 RMD160 a3956c91ff8ec359aad0ec9c4dd1bc674cd7813f SHA1 3b9c8fbb84ec63ed02464914fd22d5215e08d47d SHA256 2fedd92b4bc013b814c36af6c28341de5c04fadfaf339977f482224b08f3d383 +MD5 d56f6b34670489039325abe90d622a6c files/swank-r5.asd 2264 +RMD160 a3956c91ff8ec359aad0ec9c4dd1bc674cd7813f files/swank-r5.asd 2264 +SHA256 2fedd92b4bc013b814c36af6c28341de5c04fadfaf339977f482224b08f3d383 files/swank-r5.asd 2264 +AUX swank.asd 2161 RMD160 57699bd2a0f8325b30715948dbd1dc688fd0f8c1 SHA1 5f8536d97b74583f0b6260081775b4295c1f3804 SHA256 e35f51cc7b91414bbc3df979de60245b4d4c7229d3f1f889f96718bb04482930 MD5 2fb7f0df5e95786860d421a83618720a files/swank.asd 2161 RMD160 57699bd2a0f8325b30715948dbd1dc688fd0f8c1 files/swank.asd 2161 SHA256 e35f51cc7b91414bbc3df979de60245b4d4c7229d3f1f889f96718bb04482930 files/swank.asd 2161 -MD5 185b50ff504c7da6807fffb4e73fc017 metadata.xml 1267 -RMD160 c7f206f44fcd561788623b4ec596f6e82de74948 metadata.xml 1267 -SHA256 d516dcbafdb0818785833d3a07fe626e74f67cde6f9999e9120b61ec0ae8f172 metadata.xml 1267 +EBUILD slime-cvs-0-r4.ebuild 1904 RMD160 de743dc71b7fef8f28391128d8f29fa84bade217 SHA1 188680534a1be8f33a6fffba52fa8754770f72c9 SHA256 fd071c1374f946faa50ccca0b2e1186d056d3cce01ce399503175c3165811c6a MD5 5c41251ae1b43e37853977643dfba8dc slime-cvs-0-r4.ebuild 1904 RMD160 de743dc71b7fef8f28391128d8f29fa84bade217 slime-cvs-0-r4.ebuild 1904 SHA256 fd071c1374f946faa50ccca0b2e1186d056d3cce01ce399503175c3165811c6a slime-cvs-0-r4.ebuild 1904 +EBUILD slime-cvs-0-r5.ebuild 1989 RMD160 eb9766ba2fcb4ec2fb3fa3bd5c1ec69176549398 SHA1 9326a9ab6ab263f791c47a1a17851615851167e7 SHA256 612144a4dd789400d0fab7670514a0aaa3d348cb43e7f671001247e04592783e +MD5 c9c77efe445ad30e26c84739a82db59e slime-cvs-0-r5.ebuild 1989 +RMD160 eb9766ba2fcb4ec2fb3fa3bd5c1ec69176549398 slime-cvs-0-r5.ebuild 1989 +SHA256 612144a4dd789400d0fab7670514a0aaa3d348cb43e7f671001247e04592783e slime-cvs-0-r5.ebuild 1989 +MISC ChangeLog 3266 RMD160 d59e5376c0e3303ab1094b491ac52f640bf21047 SHA1 df685ecfb1a321d55ae10a347fe7afaae8779104 SHA256 a49e6390d9f01bc34f9f0ec1a3aaa56816497e4409ec0b21f3ff08727f2ec72a +MD5 e0aa22d5af5f6ad80295002b530089c9 ChangeLog 3266 +RMD160 d59e5376c0e3303ab1094b491ac52f640bf21047 ChangeLog 3266 +SHA256 a49e6390d9f01bc34f9f0ec1a3aaa56816497e4409ec0b21f3ff08727f2ec72a ChangeLog 3266 +MISC metadata.xml 1267 RMD160 c7f206f44fcd561788623b4ec596f6e82de74948 SHA1 f91c564e0b518ab158b57faf23d419c144a5898d SHA256 d516dcbafdb0818785833d3a07fe626e74f67cde6f9999e9120b61ec0ae8f172 +MD5 185b50ff504c7da6807fffb4e73fc017 metadata.xml 1267 +RMD160 c7f206f44fcd561788623b4ec596f6e82de74948 metadata.xml 1267 +SHA256 d516dcbafdb0818785833d3a07fe626e74f67cde6f9999e9120b61ec0ae8f172 metadata.xml 1267 +MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-slime-cvs-0-r4 1 +RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-slime-cvs-0-r4 1 +SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-slime-cvs-0-r4 1 +MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-slime-cvs-0-r5 1 +RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-slime-cvs-0-r5 1 +SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-slime-cvs-0-r5 1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFEPS8kyiNZaEAZA+ARAmPlAJ0X7Qr3Fxi3Y4cTpxbRll+UsEt76gCdG2c5 -aO0WMacW4Oh558NGKPvi/Lc= -=ebua +iD8DBQFFXZMYNQqtfCuFneMRAoIrAJ9xvP+2Z1/8bxRoKXNDkRzt10xeEwCeKnuX +yzif1W7qvaU0GV8iPwiSBy0= +=P4cK -----END PGP SIGNATURE----- diff --git a/app-emacs/slime-cvs/files/digest-slime-cvs-0-r4 b/app-emacs/slime-cvs/files/digest-slime-cvs-0-r4 index e69de29bb2d1..8b137891791f 100644 --- a/app-emacs/slime-cvs/files/digest-slime-cvs-0-r4 +++ b/app-emacs/slime-cvs/files/digest-slime-cvs-0-r4 @@ -0,0 +1 @@ + diff --git a/app-emacs/slime-cvs/files/digest-slime-cvs-0-r5 b/app-emacs/slime-cvs/files/digest-slime-cvs-0-r5 new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/app-emacs/slime-cvs/files/digest-slime-cvs-0-r5 @@ -0,0 +1 @@ + diff --git a/app-emacs/slime-cvs/files/swank-r5.asd b/app-emacs/slime-cvs/files/swank-r5.asd new file mode 100644 index 000000000000..ec7c55de2732 --- /dev/null +++ b/app-emacs/slime-cvs/files/swank-r5.asd @@ -0,0 +1,84 @@ +;;; -*- mode: lisp; syntax: common-lisp; package: common-lisp -*- + +(defpackage #:swank-system + (:use #:common-lisp + #:asdf)) + +(defpackage #:swank-loader + (:use #:common-lisp)) + +(in-package #:swank-system) + +;; http://www.caddr.com/macho/archives/sbcl-devel/2004-3/3014.html + +(defclass unsafe-file (cl-source-file) ()) + +(defmethod perform :around ((op compile-op) (c unsafe-file)) + (setf (operation-on-warnings op) :ignore + (operation-on-failure op) :warn) ; adjust to taste + (call-next-method)) + +(defmacro define-swank-system (&rest sysdep-components) + `(defsystem swank + :name "Swank is the Common Lips back-end to SLIME" + :serial t + :components ((:file "swank-backend") + (:file "nregex") + ,@(mapcar #'(lambda (component) + (if (atom component) + (list :file component) + component)) + sysdep-components) + (:file "swank")) + :depends-on (#+sbcl sb-bsd-sockets))) + +#+sbcl (define-swank-system + "swank-sbcl" + "swank-source-path-parser" + "swank-source-file-cache" + "swank-gray") + +(defparameter swank-loader::*source-directory* + (asdf:component-pathname (asdf:find-system :swank))) + +#+openmcl (define-swank-system + "metering" + "swank-openmcl" + "swank-gray") + +#+cmu (define-swank-system + "swank-source-path-parser" + "swank-source-file-cache" + "swank-cmucl") + +#+clisp (define-swank-system + "xref" + "metering" + "swank-clisp" + "swank-gray") + +#+armedbear (define-swank-system + "swank-abcl") + +#+ecl (define-swank-system + "swank-ecl" "swank-gray") + +(in-package #:swank-loader) + +(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 *load-truename*) + :if-does-not-exist nil)) + +;; (funcall (intern (string :warn-unimplemented-interfaces) :swank-backend)) + +(load-site-init-file) +(load-user-init-file) + +;; swank.asd ends here diff --git a/app-emacs/slime-cvs/slime-cvs-0-r5.ebuild b/app-emacs/slime-cvs/slime-cvs-0-r5.ebuild new file mode 100644 index 000000000000..4a3c7670e6ca --- /dev/null +++ b/app-emacs/slime-cvs/slime-cvs-0-r5.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime-cvs/slime-cvs-0-r5.ebuild,v 1.1 2006/11/17 10:46:06 opfer Exp $ + +ECVS_SERVER="common-lisp.net:/project/slime/cvsroot" +if [ -z "${ECVS_BRANCH}" ]; then + ECVS_BRANCH="HEAD" +fi +ECVS_MODULE="slime" +ECVS_USER="anonymous" +ECVS_PASS="anonymous" +ECVS_CVS_OPTIONS="-dP" + +inherit elisp cvs + +DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)" +HOMEPAGE="http://common-lisp.net/project/slime/" +SRC_URI="" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~amd64" +IUSE="doc" + +DEPEND="virtual/emacs + dev-lisp/common-lisp-controller + virtual/commonlisp + doc? ( virtual/tetex sys-apps/texinfo )" + +S="${WORKDIR}/slime" + +CLPACKAGE=swank + +src_compile() { + echo "(add-to-list 'load-path \".\")" >load-path + emacs --batch -q -l load-path -f batch-byte-compile *.el || die + use doc && make -C doc all slime.pdf +} + +src_install() { + elisp-install ${PN} *.{el,elc} ${FILESDIR}/swank-loader.lisp + elisp-site-file-install ${FILESDIR}/70slime-gentoo.el + dodoc README* ChangeLog + zcat ${D}/usr/share/doc/${PF}/ChangeLog.gz \ + >${D}/usr/share/emacs/site-lisp/slime-cvs/ChangeLog + insinto /usr/share/common-lisp/source/swank + doins swank-version.el *.lisp + insinto /usr/share/common-lisp/source/swank + newins "${FILESDIR}/swank-${PR}.asd" swank.asd + dodir /usr/share/common-lisp/systems + dosym /usr/share/common-lisp/source/swank/swank.asd \ + /usr/share/common-lisp/systems + if use doc; then + dodoc doc/slime.{ps,pdf} + doinfo doc/slime.info + fi +} + +pkg_preinst() { + unregister-common-lisp-source $CLPACKAGE || die +} + +pkg_postrm() { + if ! [ -d /usr/share/common-lisp/source/$CLPACKAGE ]; then + unregister-common-lisp-source $CLPACKAGE || die + fi + elisp-site-regen || die +} + +pkg_postinst() { + register-common-lisp-source $CLPACKAGE || die + elisp-site-regen || die + zcat /usr/share/doc/${PF}/README.Gentoo |while read line; do einfo "${line}"; done +} -- 2.26.2