Break circular info file reference; Resolves Bug #138190.

Package-Manager: portage-2.1.1_pre4-r4

4 files changed, 39 insertions, 27 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/Manifest b/app-emacs/cedet/Manifest
index 2a1567afb096..5cbe710f9823 100644
--- a/app-emacs/cedet/Manifest
+++ b/app-emacs/cedet/Manifest
@@ -1,33 +1,34 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 1.0_pre3-eieio-tests-gentoo.patch 486 RMD160 c8d1fb506b4537a72ad893a80ff98ad3c2ba42c4 SHA1 a0e5408ede04b2a0f768e51a343ab0d714244cf6 SHA256 552780d62780f9dd4550a1ea92fe266144079c02a7ceac5a2c1529812a077110 size 486
+AUX 1.0_pre3-eieio-tests-gentoo.patch 486 RMD160 c8d1fb506b4537a72ad893a80ff98ad3c2ba42c4 SHA1 a0e5408ede04b2a0f768e51a343ab0d714244cf6 SHA256 552780d62780f9dd4550a1ea92fe266144079c02a7ceac5a2c1529812a077110
 MD5 b8eff3e780663b5d8e5c33f43b471633 files/1.0_pre3-eieio-tests-gentoo.patch 486
 RMD160 c8d1fb506b4537a72ad893a80ff98ad3c2ba42c4 files/1.0_pre3-eieio-tests-gentoo.patch 486
 SHA256 552780d62780f9dd4550a1ea92fe266144079c02a7ceac5a2c1529812a077110 files/1.0_pre3-eieio-tests-gentoo.patch 486
-AUX 60cedet-gentoo.el 263 RMD160 b63ecadb4d1e9261f12d5c6b76349aaa06c2a60d SHA1 bb50e89f4188dea6a3e448e71d32b4e9b9bf9ebe SHA256 1a7c1c2a570c2e3d5424978c304bdc7f3f468003e4b4cb8881887d8e7fa0ca86 size 263
+AUX 1.0_pre3-sb-info-circular-dep-gentoo.patch 366 RMD160 34db6a890982d4023051f51ee3fd1648e1964dda SHA1 23a1c5c04ad8b319224c1b515c6cd79f304dc616 SHA256 8804c2850ad211a0c57303d4f2d02fe3326a380f9f6fa24390a8b410178a0b34
+MD5 916b79c8b07d0ab1479e19a5e617f2d3 files/1.0_pre3-sb-info-circular-dep-gentoo.patch 366
+RMD160 34db6a890982d4023051f51ee3fd1648e1964dda files/1.0_pre3-sb-info-circular-dep-gentoo.patch 366
+SHA256 8804c2850ad211a0c57303d4f2d02fe3326a380f9f6fa24390a8b410178a0b34 files/1.0_pre3-sb-info-circular-dep-gentoo.patch 366
+AUX 60cedet-gentoo.el 263 RMD160 b63ecadb4d1e9261f12d5c6b76349aaa06c2a60d SHA1 bb50e89f4188dea6a3e448e71d32b4e9b9bf9ebe SHA256 1a7c1c2a570c2e3d5424978c304bdc7f3f468003e4b4cb8881887d8e7fa0ca86
 MD5 a070e39802eeece0cd8c0bf82727f2f2 files/60cedet-gentoo.el 263
 RMD160 b63ecadb4d1e9261f12d5c6b76349aaa06c2a60d files/60cedet-gentoo.el 263
 SHA256 1a7c1c2a570c2e3d5424978c304bdc7f3f468003e4b4cb8881887d8e7fa0ca86 files/60cedet-gentoo.el 263
-DIST cedet-1.0beta3a.tar.gz 1270296 size 1270296
-DIST cedet-1.0pre3.tar.gz 1357388 RMD160 5d71c5b966c162f86038e43988c5a890f43ccd2b SHA256 e62dfd7ce6761ee1df1b5abb17ce0693ecc59dfcc18803f00e1c5ce1f4096c82 size 1357388
-EBUILD cedet-1.0_beta3.ebuild 1421 RMD160 0648191b42d30697fa8e9a2f7731fec3f7ff9c05 SHA1 6a926579af84430fd659b44b6cc2ae970bb04cc0 SHA256 5aa59da862ef6854f1fb059bbd620f6ba8442bac098cb816f4e8d5bfa1a398ac size 1421
+DIST cedet-1.0beta3a.tar.gz 1270296
+DIST cedet-1.0pre3.tar.gz 1357388 RMD160 5d71c5b966c162f86038e43988c5a890f43ccd2b SHA1 03e435a5f8c89ae79ddbe34ad7978735b9dff993 SHA256 e62dfd7ce6761ee1df1b5abb17ce0693ecc59dfcc18803f00e1c5ce1f4096c82
+EBUILD cedet-1.0_beta3.ebuild 1421 RMD160 0648191b42d30697fa8e9a2f7731fec3f7ff9c05 SHA1 6a926579af84430fd659b44b6cc2ae970bb04cc0 SHA256 5aa59da862ef6854f1fb059bbd620f6ba8442bac098cb816f4e8d5bfa1a398ac
 MD5 097b9bbe128baf409f6a7fbbab4f27cf cedet-1.0_beta3.ebuild 1421
 RMD160 0648191b42d30697fa8e9a2f7731fec3f7ff9c05 cedet-1.0_beta3.ebuild 1421
 SHA256 5aa59da862ef6854f1fb059bbd620f6ba8442bac098cb816f4e8d5bfa1a398ac cedet-1.0_beta3.ebuild 1421
-EBUILD cedet-1.0_pre3-r1.ebuild 1669 RMD160 927ff40bd0892c60637213601b046f9c4cef0666 SHA1 870e2d0e494aa3c5f8a26800c0f1a930aa0cdc0d SHA256 8c9758333b36288fa39ca009f3d924e4c1476ccb0a26e37be002baa6f38ac400 size 1669
-MD5 5838e9dfdc4042df3b7a53a440ce0748 cedet-1.0_pre3-r1.ebuild 1669
-RMD160 927ff40bd0892c60637213601b046f9c4cef0666 cedet-1.0_pre3-r1.ebuild 1669
-SHA256 8c9758333b36288fa39ca009f3d924e4c1476ccb0a26e37be002baa6f38ac400 cedet-1.0_pre3-r1.ebuild 1669
-EBUILD cedet-1.0_pre3.ebuild 1557 RMD160 54a96383d77015749b7317fb60f4c8b78ef2464c SHA1 6bc0d90e4838e108485cf8fc6e8d618f880d5bed SHA256 8b69542d5afebb5a0be9a1c30a0e4efdb9952945975a03ef22aabd63617b5801 size 1557
+EBUILD cedet-1.0_pre3-r1.ebuild 1746 RMD160 3ff616b2e82c4605e5f1a918f4b7b3a78ef9707a SHA1 bd52ef598ab9c1c67eb047fd21a26d6fdf429f90 SHA256 b2ef78d9baf3feaea4db75db2fb0a2abe0e3d5ae050986afc5db79010f14fb32
+MD5 e4280a281ac095ca5e19a9098f594ca9 cedet-1.0_pre3-r1.ebuild 1746
+RMD160 3ff616b2e82c4605e5f1a918f4b7b3a78ef9707a cedet-1.0_pre3-r1.ebuild 1746
+SHA256 b2ef78d9baf3feaea4db75db2fb0a2abe0e3d5ae050986afc5db79010f14fb32 cedet-1.0_pre3-r1.ebuild 1746
+EBUILD cedet-1.0_pre3.ebuild 1557 RMD160 54a96383d77015749b7317fb60f4c8b78ef2464c SHA1 6bc0d90e4838e108485cf8fc6e8d618f880d5bed SHA256 8b69542d5afebb5a0be9a1c30a0e4efdb9952945975a03ef22aabd63617b5801
 MD5 52a9909ec33871d20ae4687422c3b16c cedet-1.0_pre3.ebuild 1557
 RMD160 54a96383d77015749b7317fb60f4c8b78ef2464c cedet-1.0_pre3.ebuild 1557
 SHA256 8b69542d5afebb5a0be9a1c30a0e4efdb9952945975a03ef22aabd63617b5801 cedet-1.0_pre3.ebuild 1557
-MISC ChangeLog 1641 RMD160 06183d745b0d5ce95aa9c493967d5427f012ecaa SHA1 5738300c0ef0620b9d9be74346d12190d575978d SHA256 075132b1ac317abaf6200a703c0a5486b0e216e2aa817fa56c36a44d708967f2 size 1641
-MD5 990ba8038b825f5f2044799cfd4c929a ChangeLog 1641
-RMD160 06183d745b0d5ce95aa9c493967d5427f012ecaa ChangeLog 1641
-SHA256 075132b1ac317abaf6200a703c0a5486b0e216e2aa817fa56c36a44d708967f2 ChangeLog 1641
-MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab size 158
+MISC ChangeLog 1836 RMD160 eb1d8699cea9ff1a361b09ad3c21307416bf5330 SHA1 eb47b90a23d366f6809648f3361958c4ba9048e3 SHA256 06e522f13223fb5c3b832d81e46b238cc4fa62a1c40a11b5e78ebedb2452c940
+MD5 3de1b5aee7f820b3b12640aaf05d7338 ChangeLog 1836
+RMD160 eb1d8699cea9ff1a361b09ad3c21307416bf5330 ChangeLog 1836
+SHA256 06e522f13223fb5c3b832d81e46b238cc4fa62a1c40a11b5e78ebedb2452c940 ChangeLog 1836
+MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
@@ -40,10 +41,3 @@ SHA256 39808e0ed8dd64cd82c4b3d6ee5e1ff9cc576cd148649f9d95df18f214c15180 files/di
 MD5 00fedf05101b88ab50d3d805210d407d files/digest-cedet-1.0_pre3-r1 244
 RMD160 01ef5dca11e82087d1f375498923e0c6af263de3 files/digest-cedet-1.0_pre3-r1 244
 SHA256 39808e0ed8dd64cd82c4b3d6ee5e1ff9cc576cd148649f9d95df18f214c15180 files/digest-cedet-1.0_pre3-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEaK5xyiNZaEAZA+ARApXuAJwLqq7vZBoEVdut8AWoHLiOvC4lSACaAiTi
-Si8eoCd9+UTh5B3mN/hp/o8=
-=7QDF
------END PGP SIGNATURE-----
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