diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-03-06 08:17:48 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-03-06 08:17:48 +0000 |
| commit | b7d242f4075324f743bdb04fa9fb2e1c74012e94 (patch) | |
| tree | c8cee2ca86f8aa77d77cc55aac7d67ea6cb49527 | |
| parent | Mask net-p2p/pysoulseek for removal. (bug #307971) (diff) | |
| download | gentoo-2-b7d242f4075324f743bdb04fa9fb2e1c74012e94.tar.gz gentoo-2-b7d242f4075324f743bdb04fa9fb2e1c74012e94.tar.bz2 gentoo-2-b7d242f4075324f743bdb04fa9fb2e1c74012e94.zip | |
Fix bogus eval-after-load call in cogre, bug 307321.
(Portage version: 2.2_rc63/cvs/Linux i686)
| -rw-r--r-- | app-emacs/cedet/ChangeLog | 8 | ||||
| -rw-r--r-- | app-emacs/cedet/cedet-1.0_pre7-r1.ebuild (renamed from app-emacs/cedet/cedet-1.0_pre7.ebuild) | 3 | ||||
| -rw-r--r-- | app-emacs/cedet/files/cedet-1.0_pre7-cogre-srecode-init.patch | 14 |
3 files changed, 23 insertions, 2 deletions
diff --git a/app-emacs/cedet/ChangeLog b/app-emacs/cedet/ChangeLog index 08e201bfc384..4120ac222d1d 100644 --- a/app-emacs/cedet/ChangeLog +++ b/app-emacs/cedet/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emacs/cedet # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.50 2010/03/02 19:25:10 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.51 2010/03/06 08:17:47 ulm Exp $ + +*cedet-1.0_pre7-r1 (06 Mar 2010) + + 06 Mar 2010; Ulrich Mueller <ulm@gentoo.org> -cedet-1.0_pre7.ebuild, + +cedet-1.0_pre7-r1.ebuild, +files/cedet-1.0_pre7-cogre-srecode-init.patch: + Fix bogus eval-after-load call in cogre (patch from upstream), bug 307321. 02 Mar 2010; Ulrich Mueller <ulm@gentoo.org> files/50cedet-gentoo.el: Use "require" instead of "load", in order to make the site-init file diff --git a/app-emacs/cedet/cedet-1.0_pre7.ebuild b/app-emacs/cedet/cedet-1.0_pre7-r1.ebuild index 6ca28088cb6a..1cb428c3a23c 100644 --- a/app-emacs/cedet/cedet-1.0_pre7.ebuild +++ b/app-emacs/cedet/cedet-1.0_pre7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre7.ebuild,v 1.1 2010/02/27 10:30:48 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre7-r1.ebuild,v 1.1 2010/03/06 08:17:47 ulm Exp $ NEED_EMACS=22 @@ -22,6 +22,7 @@ RDEPEND="!app-emacs/semantic !app-emacs/speedbar" S="${WORKDIR}/${MY_P}" +ELISP_PATCHES="${P}-cogre-srecode-init.patch" SITEFILE="50${PN}-gentoo.el" src_compile() { diff --git a/app-emacs/cedet/files/cedet-1.0_pre7-cogre-srecode-init.patch b/app-emacs/cedet/files/cedet-1.0_pre7-cogre-srecode-init.patch new file mode 100644 index 000000000000..8447542d5216 --- /dev/null +++ b/app-emacs/cedet/files/cedet-1.0_pre7-cogre-srecode-init.patch @@ -0,0 +1,14 @@ +http://bugs.gentoo.org/307321 +http://sourceforge.net/mailarchive/message.php?msg_name=4B91BD19.2010900%40siege-engine.com + +--- cedet-1.0pre7-orig/cogre/cogre-srecode.el ++++ cedet-1.0pre7/cogre/cogre-srecode.el +@@ -71,7 +71,7 @@ + )) + + ;;;###autoload +-(eval-after-load "srecode-map" (cogre-srecode-setup)) ++(eval-after-load "srecode-map" '(cogre-srecode-setup)) + + ;;;###autoload + (defun srecode-semantic-handle-:dot (dict) |