diff options
Diffstat (limited to 'app-emacs')
| -rw-r--r-- | app-emacs/cedet/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emacs/cedet/Manifest | 15 | ||||
| -rw-r--r-- | app-emacs/cedet/cedet-1.0_pre6.ebuild | 3 | ||||
| -rw-r--r-- | app-emacs/cedet/files/50cedet-gentoo.el | 3 | ||||
| -rw-r--r-- | app-emacs/cedet/files/cedet-1.0_pre6-fix-eieio-comp.patch | 18 |
5 files changed, 33 insertions, 12 deletions
diff --git a/app-emacs/cedet/ChangeLog b/app-emacs/cedet/ChangeLog index 95c76f2386bd..d1602d8654f8 100644 --- a/app-emacs/cedet/ChangeLog +++ b/app-emacs/cedet/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emacs/cedet # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.45 2009/06/03 16:18:02 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.46 2009/08/10 19:51:01 ulm Exp $ + + 10 Aug 2009; Ulrich Mueller <ulm@gentoo.org> cedet-1.0_pre6.ebuild, + +files/cedet-1.0_pre6-fix-eieio-comp.patch: + Fix byte-compilation of EIEIO with Emacs 23.1.50, bug 280984. 03 Jun 2009; Christian Faulhammer <fauli@gentoo.org> -files/1.0_pre3-eieio-tests-gentoo.patch, diff --git a/app-emacs/cedet/Manifest b/app-emacs/cedet/Manifest index f714fe41eb31..88ea369160bf 100644 --- a/app-emacs/cedet/Manifest +++ b/app-emacs/cedet/Manifest @@ -1,15 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 50cedet-gentoo.el 467 RMD160 5b42a1f44cc32b791f9906c020e7430a8bc8f88e SHA1 868d47d53ff6ce1b2af36be7916f66f4eaa84946 SHA256 0dc23c9370f521e6364770effda1696bf046d76cd099f677a932bd3a80774ef2 +AUX 50cedet-gentoo.el 431 RMD160 b5bc7021dbd536ed1f28e910f1c28c2fec288823 SHA1 de722c9351d93896788ae2279a0c233e09b2330b SHA256 d0c47f18f54a4df449c232a157ef92aeaa2a77d9088914b6e30a1750c3d29bd9 +AUX cedet-1.0_pre6-fix-eieio-comp.patch 645 RMD160 18c3a46e1e298ccf255f2839f559cd044e0a961d SHA1 c87eb873c647e10da0fda12d90ab65e9114cc003 SHA256 ab6b599e7b19f63d8640209f2637299ae2b694640b453d517cf33cfb70f07568 DIST cedet-1.0pre6.tar.gz 1895977 RMD160 9c82cdb47d7141703825cdc976dd47984b5b4750 SHA1 e8978695e0a552e1d9484721172ce0251658900c SHA256 abb7fbe7964e2df66848e8a72158c9837414c9467545fc3a13412d2a33296d5f -EBUILD cedet-1.0_pre6.ebuild 2126 RMD160 bed9b7a2bc49d69e41acf75836742dd1090e9ede SHA1 bf4f3b8bfdf46dca8f516fe7e1ce4cfbf0debb73 SHA256 0deda4066f7abf4c8276408cd4e8f7417981186612c212aa20a1037e0a299416 -MISC ChangeLog 6345 RMD160 f8bffe5da23b0a73ceed27831d0ac92aa1d554b4 SHA1 09d7779526ccc4cc96b65b13bca925e7a14b7095 SHA256 dfc3617ff528f757daa275748d4fb5ff1a649678819b1b9338f10ea2595d2d3e +EBUILD cedet-1.0_pre6.ebuild 2164 RMD160 a989489fe362d5014fd296f90586e713200477e4 SHA1 64d5fb73997e477b7e8873ac9280839acbbc458a SHA256 324fed6364377937643228c9ed9ce1bff32c7052ea1654bb2f64c42afad47634 +MISC ChangeLog 6524 RMD160 6a3cb80623de54b3b6f0f458a1bb8d569f5f39df SHA1 9afaaac332e156206889d1798ea3ffe989e39803 SHA256 30dc30756f503affaf3fd84fda6bf53122f7b3f168947e99c7373ab82abd2df9 MISC metadata.xml 831 RMD160 742d588c9f37c4639acf627470e88e8da5c9e8c4 SHA1 315ec457e01f99f17211cf7229a17caec0ff3bf6 SHA256 3ef03457bb7af19d84fdd463e7a780ee79fa2812f5bd04fe5b15064d648b2999 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v1.4.9 (GNU/Linux) -iEYEARECAAYFAkomoj8ACgkQNQqtfCuFneNArACePl4dthEiQEgTCmUcbuFOOmKs -yLAAniyRDOGPzYhLco/bjiga9BPVq65j -=mSlF +iEYEARECAAYFAkqAeqMACgkQOeoy/oIi7uzdgwCcC2bpmK24PeV4LgWi3v+2r7TH +qq0AoOVwTM2oB2pg1ck6401AU8rV3DU+ +=yWD2 -----END PGP SIGNATURE----- diff --git a/app-emacs/cedet/cedet-1.0_pre6.ebuild b/app-emacs/cedet/cedet-1.0_pre6.ebuild index 2f6250ad82b3..ac47e7f110a7 100644 --- a/app-emacs/cedet/cedet-1.0_pre6.ebuild +++ b/app-emacs/cedet/cedet-1.0_pre6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre6.ebuild,v 1.6 2009/04/14 09:52:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre6.ebuild,v 1.7 2009/08/10 19:51:01 ulm Exp $ NEED_EMACS=22 @@ -22,6 +22,7 @@ RDEPEND="!app-emacs/semantic !app-emacs/speedbar" S="${WORKDIR}/${MY_P}" +ELISP_PATCHES="${P}-fix-eieio-comp.patch" SITEFILE="50${PN}-gentoo.el" src_compile() { diff --git a/app-emacs/cedet/files/50cedet-gentoo.el b/app-emacs/cedet/files/50cedet-gentoo.el index 621e2f1a1f6f..6b7abf49da30 100644 --- a/app-emacs/cedet/files/50cedet-gentoo.el +++ b/app-emacs/cedet/files/50cedet-gentoo.el @@ -1,6 +1,3 @@ - -;;; cedet site-lisp configuration - (load "@SITELISP@/common/cedet" nil t) (add-to-list 'image-load-path "@SITEETC@/common/icons" t) (setq srecode-map-load-path diff --git a/app-emacs/cedet/files/cedet-1.0_pre6-fix-eieio-comp.patch b/app-emacs/cedet/files/cedet-1.0_pre6-fix-eieio-comp.patch new file mode 100644 index 000000000000..6dcd2b2235d5 --- /dev/null +++ b/app-emacs/cedet/files/cedet-1.0_pre6-fix-eieio-comp.patch @@ -0,0 +1,18 @@ +http://bugs.gentoo.org/280984 +Fix byte-compilation of EIEIO with Emacs 23.1.50 (as of 2009-07-23). +Patch from upstream CVS. + +--- cedet/eieio/eieio-comp.el 2008/09/29 00:18:57 1.14 ++++ cedet/eieio/eieio-comp.el 2009/07/27 11:32:06 1.15 +@@ -78,7 +78,10 @@ + (class (if (listp arg1) (nth 1 arg1) nil)) + (my-outbuffer (if (eval-when-compile + (string-match "XEmacs" emacs-version)) +- byte-compile-outbuffer outbuffer)) ++ byte-compile-outbuffer ++ (condition-case nil ++ bytecomp-outbuffer ++ (error outbuffer)))) + ) + (let ((name (format "%s::%s" (or class "#<generic>") meth))) + (if byte-compile-verbose |