Version bumped. Added app-emacs/cedet as an alternative to speedbar, eieio and semantic; bug #64395.

7 files changed, 47 insertions, 49 deletions

diff --git a/app-emacs/ecb/ChangeLog b/app-emacs/ecb/ChangeLog
index f8f1e894aa94..d471a073e9a5 100644
--- a/app-emacs/ecb/ChangeLog
+++ b/app-emacs/ecb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/ecb
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ChangeLog,v 1.12 2004/08/27 12:41:08 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ChangeLog,v 1.13 2004/09/23 05:30:24 usata Exp $
+
+*ecb-2.27 (23 Sep 2004)
+
+  23 Sep 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -files/ecb-help.el-ecb-1.96-gentoo.diff, -ecb-1.96.ebuild, ecb-2.24.ebuild,
+  +ecb-2.27.ebuild:
+  Version bumped. Added app-emacs/cedet as an alternative to speedbar,
+  eieio and semantic; bug #64395.
 
   27 Aug 2004; Jared Hudson <jhhudso@gentoo.org> : Added ~amd64 keyword
 	
diff --git a/app-emacs/ecb/Manifest b/app-emacs/ecb/Manifest
index 94f566c64c35..2cfeb9e63276 100644
--- a/app-emacs/ecb/Manifest
+++ b/app-emacs/ecb/Manifest
@@ -1,10 +1,12 @@
 MD5 ea35fe9fd82f42792f122dc149f62106 ChangeLog 2214
-MD5 3feffc68137e065a4fa70fbec11c8502 ecb-1.96.ebuild 1247
-MD5 cb3ec596fdb175744e9307bdde3d8a4b ecb-2.21.ebuild 1207
 MD5 5d60bc446e7bf7fe7837f43e84c6adc0 ecb-2.24.ebuild 1219
+MD5 3feffc68137e065a4fa70fbec11c8502 ecb-1.96.ebuild 1247
 MD5 d66885a4f4fda4d047843a29bc611fa5 metadata.xml 1347
+MD5 cb3ec596fdb175744e9307bdde3d8a4b ecb-2.21.ebuild 1207
+MD5 715589f667970b23ede6544db15cd0fe ecb-2.27.ebuild 1213
+MD5 6d1127de5ae48c2d2092034ecd59f58c files/digest-ecb-2.27 60
 MD5 af9f327c163294046f2addc281abd91f files/70ecb-gentoo.el 88
-MD5 16eb737af1695abe7371fc78c0a863b3 files/digest-ecb-1.96 60
-MD5 55d3c6fd5bb0cfbfea6600fc4340226b files/digest-ecb-2.21 60
 MD5 eaf88c4204fa1150d1e9ee41b7c8dd9f files/digest-ecb-2.24 60
+MD5 16eb737af1695abe7371fc78c0a863b3 files/digest-ecb-1.96 60
 MD5 b2fecab970cb3caf89959102b9494cc9 files/ecb-help.el-ecb-1.96-gentoo.diff 1270
+MD5 55d3c6fd5bb0cfbfea6600fc4340226b files/digest-ecb-2.21 60
diff --git a/app-emacs/ecb/ecb-2.24.ebuild b/app-emacs/ecb/ecb-2.24.ebuild
index d2237ac0421b..e8e6c80ef86f 100644
--- a/app-emacs/ecb/ecb-2.24.ebuild
+++ b/app-emacs/ecb/ecb-2.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-2.24.ebuild,v 1.5 2004/08/27 12:41:08 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-2.24.ebuild,v 1.6 2004/09/23 05:30:24 usata Exp $
 
 inherit elisp
 
@@ -9,12 +9,16 @@ HOMEPAGE="http://ecb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ecb/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE="java"
 DEPEND="virtual/emacs
-	>=app-emacs/speedbar-0.14_beta4
-	>=app-emacs/semantic-1.4
-	>=app-emacs/eieio-0.17
+	|| (
+		( >=app-emacs/speedbar-0.14_beta4
+		>=app-emacs/semantic-1.4
+		>=app-emacs/eieio-0.17
+		)
+		app-emacs/cedet
+	)
 	java? ( app-emacs/jde )"
 
 src_unpack() {
diff --git a/app-emacs/ecb/ecb-1.96.ebuild b/app-emacs/ecb/ecb-2.27.ebuild
index d0b339d3dfb8..eedb49963c48 100644
--- a/app-emacs/ecb/ecb-1.96.ebuild
+++ b/app-emacs/ecb/ecb-2.27.ebuild
@@ -1,41 +1,49 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-1.96.ebuild,v 1.5 2004/06/24 22:09:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-2.27.ebuild,v 1.1 2004/09/23 05:30:24 usata Exp $
 
-inherit elisp eutils
+inherit elisp
 
 DESCRIPTION="ECB is a source code browser for Emacs"
 HOMEPAGE="http://ecb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ecb/${P}.tar.gz"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="java"
-
 DEPEND="virtual/emacs
-	>=app-emacs/speedbar-0.14_beta4
-	>=app-emacs/semantic-1.4
-	>=app-emacs/eieio-0.17
+	|| (
+		( >=app-emacs/speedbar-0.14_beta4
+		>=app-emacs/semantic-1.4
+		>=app-emacs/eieio-0.17
+		)
+		app-emacs/cedet
+	)
 	java? ( app-emacs/jde )"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/ecb-help.el-${P}-gentoo.diff
-	sed -ie "s,@ECB_INFO@,/usr/share/info/ecb.info.gz,g" ${S}/ecb-help.el
-	sed -ie "s,@ECB_HTML@,/usr/share/doc/${P}/html/ecb.html,g" ${S}/ecb-help.el
+	cd ${S}
+	sed -i -e "s%./info-help%../../../info%" \
+		-e "s%./html-help%../../../doc/${P}/html%" \
+		-e "/defconst/s%ecb.info%ecb.info.gz%" \
+		ecb-help.el
 }
 
 src_compile() {
 	local my_loadpath="${SITELISP}/semantic ${SITELISP}/eieio"
 	use java \
 		&& my_loadpath="${my_loadpath} ${SITELISP}/elib ${SITELISP}/jde/lisp"
-	make \
+
+	if has_version "app-emacs/cedet" ; then
+		CEDET="${SITELISP}/cedet"
+	fi
+	make ${CEDET} \
 		LOADPATH="${my_loadpath}" \
-		|| die
+		|| die "make failed"
 	make online-help \
 		LOADPATH="${my_loadpath}" \
-		|| die
+		|| die "make online-help failed"
 }
 
 src_install() {
diff --git a/app-emacs/ecb/files/digest-ecb-1.96 b/app-emacs/ecb/files/digest-ecb-1.96
deleted file mode 100644
index 3c3583ea1854..000000000000
--- a/app-emacs/ecb/files/digest-ecb-1.96
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3678a87f883ef3f96a20d81068a96ffc ecb-1.96.tar.gz 493263
diff --git a/app-emacs/ecb/files/digest-ecb-2.27 b/app-emacs/ecb/files/digest-ecb-2.27
new file mode 100644
index 000000000000..2082b98625b2
--- /dev/null
+++ b/app-emacs/ecb/files/digest-ecb-2.27
@@ -0,0 +1 @@
+MD5 2ae7ed3c849dd159a2410b1745016535 ecb-2.27.tar.gz 714811
diff --git a/app-emacs/ecb/files/ecb-help.el-ecb-1.96-gentoo.diff b/app-emacs/ecb/files/ecb-help.el-ecb-1.96-gentoo.diff
deleted file mode 100644
index 839e1d135c87..000000000000
--- a/app-emacs/ecb/files/ecb-help.el-ecb-1.96-gentoo.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u ecb-1.96.orig/ecb-help.el ecb-1.96/ecb-help.el
---- ecb-1.96.orig/ecb-help.el	2003-09-15 03:54:06.000000000 -0500
-+++ ecb-1.96/ecb-help.el	2003-09-20 22:19:59.769898240 -0500
-@@ -80,16 +80,7 @@
-                  (const :tag "Html" :value html)))
- 
- 
--(defcustom ecb-help-info-path (concat
--                               (if ecb-running-xemacs
--                                   (if (file-exists-p
--                                        (concat ecb-ecb-dir
--                                                ecb-help-info-subdir
--                                                ecb-help-info-start-file))
--                                       ecb-help-info-subdir
--                                     "../../info/")
--                                 ecb-help-info-subdir)
--                               ecb-help-info-start-file)
-+(defcustom ecb-help-info-path "@ECB_INFO@"
-   "*Path where the ECB online help in info format resides.
- This must be the location of the file \"ecb.info\" which comes with the ECB
- distribution. If is installed by unpacking the archive available on the ECB
-Only in ecb-1.96: ecb-help.el~
-Common subdirectories: ecb-1.96.orig/html-help and ecb-1.96/html-help
-Common subdirectories: ecb-1.96.orig/info-help and ecb-1.96/info-help