Fix bogus eval-after-load call in cogre, bug 307321.

Package-Manager: portage-2.2_rc63/cvs/Linux i686

4 files changed, 30 insertions, 8 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/Manifest b/app-emacs/cedet/Manifest
index 77a3fe72f140..3471e32c4527 100644
--- a/app-emacs/cedet/Manifest
+++ b/app-emacs/cedet/Manifest
@@ -4,16 +4,17 @@ Hash: SHA1
 AUX 50cedet-gentoo-1.0_pre6.el 431 RMD160 b5bc7021dbd536ed1f28e910f1c28c2fec288823 SHA1 de722c9351d93896788ae2279a0c233e09b2330b SHA256 d0c47f18f54a4df449c232a157ef92aeaa2a77d9088914b6e30a1750c3d29bd9
 AUX 50cedet-gentoo.el 519 RMD160 23d1339390986080f21b23f64a72ef79196be625 SHA1 492d18330ea8ad416cb24bb7145c300ca78c20a5 SHA256 4d55c2ebd679c6825087453925c5488e2c732a84cc8fd3cec5c081da5eb9f395
 AUX cedet-1.0_pre6-fix-eieio-comp.patch 645 RMD160 18c3a46e1e298ccf255f2839f559cd044e0a961d SHA1 c87eb873c647e10da0fda12d90ab65e9114cc003 SHA256 ab6b599e7b19f63d8640209f2637299ae2b694640b453d517cf33cfb70f07568
+AUX cedet-1.0_pre7-cogre-srecode-init.patch 427 RMD160 9330b196e506a83c0c717a1b17978fbcfc96790f SHA1 3e0b2b2fe896b1b63a98ba132d59db5f700a991c SHA256 4f55f34e9dcfb249df29a615da4878408d09233d0d7770c22753d59d9de4ede7
 DIST cedet-1.0pre6.tar.gz 1895977 RMD160 9c82cdb47d7141703825cdc976dd47984b5b4750 SHA1 e8978695e0a552e1d9484721172ce0251658900c SHA256 abb7fbe7964e2df66848e8a72158c9837414c9467545fc3a13412d2a33296d5f
 DIST cedet-1.0pre7.tar.gz 2052276 RMD160 4f90db2ad9c63a3d8ff6ac9e3a1c83f99fb2b777 SHA1 b48bfe50df43b6941e9ffd40256c10d58b14b832 SHA256 63392bea5b8e573e6cdf5cc7e43d76f931a35d7596718527ab5b598ca905991e
 EBUILD cedet-1.0_pre6.ebuild 2332 RMD160 28e57728b3bb517ebee7a7e664948e787b16ca28 SHA1 7ad774011a6de09fe81d68d081f859c36e9dce4d SHA256 d06e8022105f62859e696b9fbc225925412b65b441009bdbaad23a12d706aa9e
-EBUILD cedet-1.0_pre7.ebuild 2287 RMD160 4be7f47c8b9d4b386b53723b9c5b6a198e353fc7 SHA1 e68a26c243a83b41335ca259d5886a8bc066601c SHA256 9e617de707d913b4b4a7a324044cb278c4da7553e1f0de4435e47cb986b48fa0
-MISC ChangeLog 7185 RMD160 6493188e7a8796b61bc0e7640430ac60f37cc4bd SHA1 6c0fa103c112ccb4b387aa70067328015f2046dc SHA256 fa545ff3d50c82eca5bc2a6e8e9ea0193cf2d4b0408ad3662dccf8071566021e
+EBUILD cedet-1.0_pre7-r1.ebuild 2336 RMD160 5f91d2147f135c29a0d4de52b01a9e8db96e5cc1 SHA1 9b951c2a57983542031b55e6380aade68b959a2f SHA256 157259d768c625c051acf878f2cec745abb655458c36ca8f9fa09ac983424d84
+MISC ChangeLog 7445 RMD160 8190e8c83acce31c0678fef8069d2c4d42acf4ac SHA1 4064d48e69f77a1184b6d838cb719f30c2354827 SHA256 398a79b0a97ffad38ebab82536b8367eb5d574d08c361482afd1ad1620acc5f2
 MISC metadata.xml 831 RMD160 742d588c9f37c4639acf627470e88e8da5c9e8c4 SHA1 315ec457e01f99f17211cf7229a17caec0ff3bf6 SHA256 3ef03457bb7af19d84fdd463e7a780ee79fa2812f5bd04fe5b15064d648b2999
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkuNZikACgkQOeoy/oIi7uxmOACg6DDlPtlNRGPk5QFM2PSVrNLE
-oUEAn18+7RoScqPqWOQn4I4eT3ntL0zO
-=cUC7
+iEYEARECAAYFAkuSD7QACgkQOeoy/oIi7uz5uwCglcSMRQRnj5b72H+2zcfg6EBp
+Kl8An03uAwFknbC0o9UtlVtpvj/vdQ3S
+=pMnf
 -----END PGP SIGNATURE-----
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)