resolves bug 18863

6 files changed, 95 insertions, 5 deletions

diff --git a/app-emacs/ecb/ChangeLog b/app-emacs/ecb/ChangeLog
index bebe76df3c45..d7c049b83755 100644
--- a/app-emacs/ecb/ChangeLog
+++ b/app-emacs/ecb/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-emacs/ecb
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ChangeLog,v 1.4 2003/03/08 22:37:15 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ChangeLog,v 1.5 2003/09/21 03:52:32 mkennedy Exp $
+
+*ecb-1.96 (20 Sep 2003)
+
+  20 Sep 2003; Matthew Kennedy <mkennedy@gentoo.org> ecb-1.96.ebuild,
+  files/70ecb-gentoo.el, files/ecb-help.el-ecb-1.96-gentoo.diff:
+  version bump with improvements submitted by Marshall T. Vandegrift
+  <vandem2@rpi.edu> of bug #18863: Updated the project homepage, Removed
+  unnecessary dependancies, Added useful version numbers for dependancies, Made
+  the JDEE dependancy optional, based on the 'java' USE flag, Added useful
+  loading commands to the site-file, Changed the site-file to the '70' prefix,
+  so that it loads after EIEIO and semantic, Cleaned up patching and
+  documentation-generation
 
 *ecb-1.90 (31 Jan 2003)
 
diff --git a/app-emacs/ecb/Manifest b/app-emacs/ecb/Manifest
index 4723df0db9dd..7ea43d1ec1c3 100644
--- a/app-emacs/ecb/Manifest
+++ b/app-emacs/ecb/Manifest
@@ -1,8 +1,7 @@
-MD5 a43de176a2973e952d00e2a3da0fc297 ChangeLog 774
+MD5 c41384253485f4a9560dc149306fdd70 ChangeLog 1407
 MD5 ee9bb53fb090e02e955d866401bcec12 ecb-1.80.ebuild 1702
 MD5 433aafbf99ba4709ae3fd0e7f934e799 ecb-1.90.ebuild 1530
-MD5 475cdd8b7c3770909d62279abbb3da80 ecb-1.96.ebuild 1157
-MD5 77302aa6436dbaef4ab1adfd67cc5c6a ecb-1.96.ebuild~ 1263
+MD5 b257d3b6885a997cef06299794260d2f ecb-1.96.ebuild 1274
 MD5 bf88d754c37fc5df12a996583552816b files/50ecb-gentoo.el 134
 MD5 3d51075abd295aa76775d1c315d35dcc files/digest-ecb-1.80 60
 MD5 caecb2f0e391a0260149b86a9877e560 files/digest-ecb-1.90 60
@@ -10,5 +9,5 @@ MD5 3888d43ea733def4c7566c06aa442f79 files/ecb-1.90-gentoo.patch 2393
 MD5 0a0e7458fb9bcb8ccffce77ab25944a9 files/ecb-help.el-gentoo.patch 1427
 MD5 9f6fdeeb2bb9e4dfef117f28fe5995de files/ecb.texi-gentoo.patch 251
 MD5 100b2f2e83bbbbe6d0f26279ac4c5c17 files/70ecb-gentoo.el 97
-MD5 7642fb00bc73f44f7d590fa4f006d892 files/ecb-help.el-ecb-1.93-gentoo.diff 2148
 MD5 16eb737af1695abe7371fc78c0a863b3 files/digest-ecb-1.96 60
+MD5 b2fecab970cb3caf89959102b9494cc9 files/ecb-help.el-ecb-1.96-gentoo.diff 1270
diff --git a/app-emacs/ecb/ecb-1.96.ebuild b/app-emacs/ecb/ecb-1.96.ebuild
new file mode 100644
index 000000000000..5cc9a1873d79
--- /dev/null
+++ b/app-emacs/ecb/ecb-1.96.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2003 Gentoo Technologies, Inc.
+# 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.1 2003/09/21 03:52:32 mkennedy Exp $
+
+inherit elisp
+
+IUSE="java"
+
+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"
+
+DEPEND="virtual/emacs
+	>=app-emacs/speedbar-0.14_beta4
+	>=app-emacs/semantic-1.4
+	>=app-emacs/eieio-0.17
+	java? ( app-emacs/jde )"
+
+S="${WORKDIR}/${P}"
+
+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
+}
+
+src_compile() {
+	local my_loadpath="${SITELISP}/semantic ${SITELISP}/eieio"
+	[ "`use java`" ] \
+		&& my_loadpath="${my_loadpath} ${SITELISP}/elib ${SITELISP}/jde/lisp"
+	make \
+		LOADPATH="${my_loadpath}" \
+		|| die
+	make online-help \
+		LOADPATH="${my_loadpath}" \
+		|| die
+}
+
+src_install() {
+	elisp-install ${PN} *.el *.elc
+	elisp-site-file-install ${FILESDIR}/70ecb-gentoo.el
+	dodoc NEWS README RELEASE_NOTES
+	doinfo info-help/ecb.info*
+	dohtml html-help/*.html
+}
diff --git a/app-emacs/ecb/files/70ecb-gentoo.el b/app-emacs/ecb/files/70ecb-gentoo.el
new file mode 100644
index 000000000000..fff58564279a
--- /dev/null
+++ b/app-emacs/ecb/files/70ecb-gentoo.el
@@ -0,0 +1,5 @@
+
+;;; ecb site-lisp configuration 
+
+(setq load-path (cons "@SITELISP@" load-path))
+(require 'ecb)
diff --git a/app-emacs/ecb/files/digest-ecb-1.96 b/app-emacs/ecb/files/digest-ecb-1.96
new file mode 100644
index 000000000000..3c3583ea1854
--- /dev/null
+++ b/app-emacs/ecb/files/digest-ecb-1.96
@@ -0,0 +1 @@
+MD5 3678a87f883ef3f96a20d81068a96ffc ecb-1.96.tar.gz 493263
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
new file mode 100644
index 000000000000..839e1d135c87
--- /dev/null
+++ b/app-emacs/ecb/files/ecb-help.el-ecb-1.96-gentoo.diff
@@ -0,0 +1,24 @@
+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