summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Kennedy <mkennedy@gentoo.org>2006-08-09 05:17:14 +0000
committerMatthew Kennedy <mkennedy@gentoo.org>2006-08-09 05:17:14 +0000
commit842474d7bb19788a22f167c5722105915af64169 (patch)
tree3bdbaa815f7c5aed3bc5ee1d5309e6d41ecb80cc /app-emacs
parentNew package; bug #143279 (diff)
downloadgentoo-2-842474d7bb19788a22f167c5722105915af64169.tar.gz
gentoo-2-842474d7bb19788a22f167c5722105915af64169.tar.bz2
gentoo-2-842474d7bb19788a22f167c5722105915af64169.zip
Break circular info file reference; Resolves Bug #138190.
(Portage version: 2.1.1_pre4-r4)
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/cedet/ChangeLog7
-rw-r--r--app-emacs/cedet/cedet-1.0_pre3-r1.ebuild3
-rw-r--r--app-emacs/cedet/files/1.0_pre3-sb-info-circular-dep-gentoo.patch12
3 files changed, 20 insertions, 2 deletions
diff --git a/app-emacs/cedet/ChangeLog b/app-emacs/cedet/ChangeLog
index 35d09afd246d..e80bd10e090f 100644
--- a/app-emacs/cedet/ChangeLog
+++ b/app-emacs/cedet/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-emacs/cedet
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.11 2006/05/15 16:38:03 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.12 2006/08/09 05:17:14 mkennedy Exp $
+
+ 09 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org>
+ +files/1.0_pre3-sb-info-circular-dep-gentoo.patch,
+ cedet-1.0_pre3-r1.ebuild:
+ Break circular info file reference; Resolves Bug #138190.
*cedet-1.0_pre3-r1 (15 May 2006)
diff --git a/app-emacs/cedet/cedet-1.0_pre3-r1.ebuild b/app-emacs/cedet/cedet-1.0_pre3-r1.ebuild
index 0b5441cf4a07..9410f16ef306 100644
--- a/app-emacs/cedet/cedet-1.0_pre3-r1.ebuild
+++ b/app-emacs/cedet/cedet-1.0_pre3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre3-r1.ebuild,v 1.1 2006/05/15 16:38:03 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre3-r1.ebuild,v 1.2 2006/08/09 05:17:14 mkennedy Exp $
inherit elisp eutils
@@ -25,6 +25,7 @@ SITEFILE="60cedet-gentoo.el"
src_unpack() {
unpack ${A}
epatch ${FILESDIR}/1.0_pre3-eieio-tests-gentoo.patch # Bug #124598
+ epatch ${FILESDIR}/1.0_pre3-sb-info-circular-dep-gentoo.patch # Bug #138190
}
src_compile() {
diff --git a/app-emacs/cedet/files/1.0_pre3-sb-info-circular-dep-gentoo.patch b/app-emacs/cedet/files/1.0_pre3-sb-info-circular-dep-gentoo.patch
new file mode 100644
index 000000000000..75b8ce069e08
--- /dev/null
+++ b/app-emacs/cedet/files/1.0_pre3-sb-info-circular-dep-gentoo.patch
@@ -0,0 +1,12 @@
+--- cedet-1.0pre3/speedbar/sb-info.el 2005-06-30 05:08:02.000000000 +0200
++++ cedet-1.0pre3/speedbar/sb-infonew.el 2006-06-27 14:43:32.000000000 +0200
+@@ -249,7 +249,7 @@
+
+ ;;; Overriding preinstalled code.
+ ;;;###autoload
+-(eval-after-load "info" '(require 'sb-info))
+-
+ (provide 'sb-info)
++
++(eval-after-load "info" '(require 'sb-info))
+ ;;; sb-info.el ends here